From: | "Michael Sterrett (mr_bones_)" <mr_bones_@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in media-libs/allegro/files: allegro-5.0.4-underlink.patch allegro-4.4.2-shared.patch allegro-4.4.2-rpath.patch allegro-4.4.2-underlink.patch |
Date: | Sat, 03 Sep 2011 08:57:21 |
Message-Id: | 20110903085709.9019620051@flycatcher.gentoo.org |
1 | mr_bones_ 11/09/03 08:57:09 |
2 | |
3 | Added: allegro-5.0.4-underlink.patch |
4 | allegro-4.4.2-shared.patch |
5 | allegro-4.4.2-rpath.patch |
6 | allegro-4.4.2-underlink.patch |
7 | Log: |
8 | version bump (bug #380657) |
9 | |
10 | (Portage version: 2.1.10.11/cvs/Linux i686) |
11 | |
12 | Revision Changes Path |
13 | 1.1 media-libs/allegro/files/allegro-5.0.4-underlink.patch |
14 | |
15 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/allegro/files/allegro-5.0.4-underlink.patch?rev=1.1&view=markup |
16 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/allegro/files/allegro-5.0.4-underlink.patch?rev=1.1&content-type=text/plain |
17 | |
18 | Index: allegro-5.0.4-underlink.patch |
19 | =================================================================== |
20 | --- CMakeLists.txt.old 2011-06-06 23:56:09.367125536 +0200 |
21 | +++ CMakeLists.txt 2011-06-06 23:56:19.311748807 +0200 |
22 | @@ -703,7 +703,7 @@ |
23 | |
24 | if(ALLEGRO_UNIX) # not MACOSX |
25 | list(APPEND LIBRARY_SOURCES ${ALLEGRO_SRC_UNIX_FILES}) |
26 | - list(APPEND PLATFORM_LIBS m ${CMAKE_THREAD_LIBS_INIT}) |
27 | + list(APPEND PLATFORM_LIBS dl m ${CMAKE_THREAD_LIBS_INIT}) |
28 | endif(ALLEGRO_UNIX) |
29 | |
30 | if(SUPPORT_X11) |
31 | |
32 | |
33 | |
34 | 1.1 media-libs/allegro/files/allegro-4.4.2-shared.patch |
35 | |
36 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/allegro/files/allegro-4.4.2-shared.patch?rev=1.1&view=markup |
37 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/allegro/files/allegro-4.4.2-shared.patch?rev=1.1&content-type=text/plain |
38 | |
39 | Index: allegro-4.4.2-shared.patch |
40 | =================================================================== |
41 | --- CMakeLists.txt |
42 | +++ CMakeLists.txt |
43 | @@ -830,7 +830,7 @@ |
44 | option(WANT_LOGG "Enable logg" on) |
45 | option(WANT_JPGALLEG "Enable JPGAlleg" on) |
46 | |
47 | -if(WANT_FRAMEWORKS) |
48 | +if(SHARED) |
49 | set(ADDON_LINKAGE SHARED) |
50 | else() |
51 | set(ADDON_LINKAGE STATIC) |
52 | |
53 | |
54 | |
55 | 1.1 media-libs/allegro/files/allegro-4.4.2-rpath.patch |
56 | |
57 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/allegro/files/allegro-4.4.2-rpath.patch?rev=1.1&view=markup |
58 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/allegro/files/allegro-4.4.2-rpath.patch?rev=1.1&content-type=text/plain |
59 | |
60 | Index: allegro-4.4.2-rpath.patch |
61 | =================================================================== |
62 | --- setup/CMakeLists.txt |
63 | +++ setup/CMakeLists.txt |
64 | @@ -1,3 +1,5 @@ |
65 | +set(CMAKE_SKIP_BUILD_RPATH TRUE) |
66 | + |
67 | add_our_executable(setup setup.c) |
68 | copy_files(copy_setup_data setup.dat) |
69 | |
70 | |
71 | |
72 | |
73 | 1.1 media-libs/allegro/files/allegro-4.4.2-underlink.patch |
74 | |
75 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/allegro/files/allegro-4.4.2-underlink.patch?rev=1.1&view=markup |
76 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/allegro/files/allegro-4.4.2-underlink.patch?rev=1.1&content-type=text/plain |
77 | |
78 | Index: allegro-4.4.2-underlink.patch |
79 | =================================================================== |
80 | --- CMakeLists.txt.old 2011-06-06 23:46:06.057320691 +0200 |
81 | +++ CMakeLists.txt 2011-06-06 23:46:21.900313261 +0200 |
82 | @@ -392,7 +392,7 @@ |
83 | message(FATAL_ERROR "Unix port requires pthreads support.") |
84 | endif() |
85 | set(ALLEGRO_HAVE_LIBPTHREAD 1) |
86 | - list(APPEND PLATFORM_LIBS m ${CMAKE_THREAD_LIBS_INIT}) |
87 | + list(APPEND PLATFORM_LIBS dl m ${CMAKE_THREAD_LIBS_INIT}) |
88 | list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_UNIX_FILES}) |
89 | |
90 | if(WANT_OSS) |