| author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
| Sun, 26 Mar 2017 13:26:42 -0700 | |
| changeset 7803 | bab5480f2396 |
| parent 5233 | 063413d20b5d |
| permissions | -rw-r--r-- |
|
5233
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
Patch origin: in-house |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
Temporary fix till 22383984 is resolved. |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
|
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
--- SDL-1.2.14/sdl-config.in |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
+++ SDL-1.2.14/sdl-config.in |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
@@ -49,7 +49,7 @@ |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
@ENABLE_SHARED_TRUE@ ;; |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
-@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ -lSDL -lpthread -lposix4 -lm -lX11 -lXext -lXrandr -lXrender -lpthread -lposix4 |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
@ENABLE_STATIC_TRUE@ ;; |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
*) |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
echo "${usage}" 1>&2
|
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
--- SDL-1.2.14/sdl.pc.in |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
+++ SDL-1.2.14/sdl.pc.in |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
@@ -11,5 +11,5 @@ |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
Requires: |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
Conflicts: |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
|
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
-Libs.private: @SDL_STATIC_LIBS@ |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
+Libs.private: -lSDL -lpthread -lposix4 -lm -lX11 -lXext -lXrandr -lXrender -lpthread -lposix4 |
|
063413d20b5d
22382829 Move libSDL from Desktop to Userland consolidation
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
Cflags: -I${includedir}/SDL @SDL_CFLAGS@
|