diff --git a/packages/media-libs/allegro/allegro-4.4.2.exheres-0 b/packages/media-libs/allegro/allegro-4.4.2.exheres-0 index 2ec4b374..49a9e3c2 100644 --- a/packages/media-libs/allegro/allegro-4.4.2.exheres-0 +++ b/packages/media-libs/allegro/allegro-4.4.2.exheres-0 @@ -50,14 +50,11 @@ DEPENDENCIES=" " DEFAULT_SRC_PREPARE_PATCHES=( - -p0 "${FILES}"/${PNV}-shared.patch - "${FILES}"/${PNV}-underlink.patch - "${FILES}"/${PNV}-gentoo.patch - "${FILES}"/${PNV}-rpath.patch - + -p0 "${FILES}"/${PNV}-underlink.patch ) CMAKE_SRC_CONFIGURE_PARAMS=( + "-DCMAKE_SKIP_BUILD_RPATH=TRUE" "-DDOCDIR=share/doc" "-DINFODIR=share/info" "-DMANDIR=share/man" @@ -88,8 +85,8 @@ src_prepare() { default edo sed -i \ - -e "s:allegro-\${ALLEGRO_VERSION}:${PNVR}:" \ - docs/CMakeLists.txt + -e 's#ADDON_LINKAGE STATIC#ADDON_LINKAGE SHARED#' \ + CMakeLists.txt } src_install() { diff --git a/packages/media-libs/allegro/files/allegro-4.4.2-gentoo.patch b/packages/media-libs/allegro/files/allegro-4.4.2-gentoo.patch deleted file mode 100644 index 119d9c78..00000000 --- a/packages/media-libs/allegro/files/allegro-4.4.2-gentoo.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- docs/CMakeLists.txt.old 2012-03-04 20:20:05.566881387 +0100 -+++ docs/CMakeLists.txt 2012-03-04 20:20:50.659714153 +0100 -@@ -71,11 +71,12 @@ - string(REGEX MATCH "[^/]*._tx" basename ${page}) - string(REPLACE "._tx" "" basename ${basename}) - -- set(page ${CMAKE_CURRENT_SOURCE_DIR}/${page}) - if(${page} MATCHES "/build/") -+ set(page ${CMAKE_CURRENT_SOURCE_DIR}/${page}) - set(txt_out ${CMAKE_CURRENT_BINARY_DIR}/build/${basename}.txt) - set(html_out ${CMAKE_CURRENT_BINARY_DIR}/build/${basename}.html) - else() -+ set(page ${CMAKE_CURRENT_SOURCE_DIR}/${page}) - set(txt_out ${CMAKE_CURRENT_BINARY_DIR}/txt/${basename}.txt) - set(html_out ${CMAKE_CURRENT_BINARY_DIR}/html/${basename}.html) - endif() diff --git a/packages/media-libs/allegro/files/allegro-4.4.2-rpath.patch b/packages/media-libs/allegro/files/allegro-4.4.2-rpath.patch deleted file mode 100644 index 57bdb6bf..00000000 --- a/packages/media-libs/allegro/files/allegro-4.4.2-rpath.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- setup/CMakeLists.txt -+++ setup/CMakeLists.txt -@@ -1,3 +1,5 @@ -+set(CMAKE_SKIP_BUILD_RPATH TRUE) -+ - add_our_executable(setup setup.c) - copy_files(copy_setup_data setup.dat) - diff --git a/packages/media-libs/allegro/files/allegro-4.4.2-shared.patch b/packages/media-libs/allegro/files/allegro-4.4.2-shared.patch deleted file mode 100644 index 665c03e3..00000000 --- a/packages/media-libs/allegro/files/allegro-4.4.2-shared.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -830,7 +830,7 @@ - option(WANT_LOGG "Enable logg" on) - option(WANT_JPGALLEG "Enable JPGAlleg" on) - --if(WANT_FRAMEWORKS) -+if(SHARED) - set(ADDON_LINKAGE SHARED) - else() - set(ADDON_LINKAGE STATIC) diff --git a/packages/media-libs/allegro/files/allegro-4.4.2-underlink.patch b/packages/media-libs/allegro/files/allegro-4.4.2-underlink.patch index 33dc9d26..eed51f0c 100644 --- a/packages/media-libs/allegro/files/allegro-4.4.2-underlink.patch +++ b/packages/media-libs/allegro/files/allegro-4.4.2-underlink.patch @@ -1,5 +1,9 @@ ---- CMakeLists.txt.old 2011-06-06 23:46:06.057320691 +0200 -+++ CMakeLists.txt 2011-06-06 23:46:21.900313261 +0200 +Source: Gentoo +Upstream: unknown +Reason: fixes underlinking + +--- CMakeLists.txt ++++ CMakeLists.txt @@ -392,7 +392,7 @@ message(FATAL_ERROR "Unix port requires pthreads support.") endif()