| 1 |
commit: 11dec3efc36313f2c88aba6d747b6ab4a8782435 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 5 11:11:11 2012 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 5 11:11:27 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=11dec3ef |
| 7 |
|
| 8 |
[kde-base/kdelibs] Fix FindXine.cmake to use pkg-config instead of xine-config wrt #397595 |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
.../kdelibs/files/kdelibs-4.7.4-xinelib12x.patch | 32 ++++++++++++++++++++ |
| 14 |
...libs-4.7.95.ebuild => kdelibs-4.7.95-r1.ebuild} | 1 + |
| 15 |
...libs-4.7.97.ebuild => kdelibs-4.7.97-r1.ebuild} | 1 + |
| 16 |
kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild | 1 + |
| 17 |
kde-base/kdelibs/kdelibs-9999.ebuild | 1 + |
| 18 |
5 files changed, 36 insertions(+), 0 deletions(-) |
| 19 |
|
| 20 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.7.4-xinelib12x.patch b/kde-base/kdelibs/files/kdelibs-4.7.4-xinelib12x.patch |
| 21 |
new file mode 100644 |
| 22 |
index 0000000..bdcd39a |
| 23 |
--- /dev/null |
| 24 |
+++ b/kde-base/kdelibs/files/kdelibs-4.7.4-xinelib12x.patch |
| 25 |
@@ -0,0 +1,32 @@ |
| 26 |
+From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Johannes Huber <johu@g.o> |
| 28 |
+Date: Thu, 5 Jan 2012 10:06:05 +0100 |
| 29 |
+Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2. |
| 30 |
+ |
| 31 |
+--- |
| 32 |
+ cmake/modules/FindXine.cmake | 4 ++-- |
| 33 |
+ 1 files changed, 2 insertions(+), 2 deletions(-) |
| 34 |
+ |
| 35 |
+diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake |
| 36 |
+index 37c58c6..d71969a 100644 |
| 37 |
+--- a/cmake/modules/FindXine.cmake |
| 38 |
++++ b/cmake/modules/FindXine.cmake |
| 39 |
+@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine |
| 40 |
+ ${PC_LIBXINE_LIBRARY_DIRS} |
| 41 |
+ ) |
| 42 |
+ |
| 43 |
+-find_program(XINECONFIG_EXECUTABLE NAMES xine-config |
| 44 |
++find_program(XINECONFIG_EXECUTABLE NAMES pkg-config |
| 45 |
+ HINTS |
| 46 |
+ ${PC_LIBXINE_PREFIX}/bin |
| 47 |
+ ) |
| 48 |
+ |
| 49 |
+ if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) |
| 50 |
+- exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) |
| 51 |
++ exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) |
| 52 |
+ if("${XINE_VERSION}" VERSION_GREATER "1.1.0") #if (... VERSION_GREATER) is new since cmake 2.6.2 |
| 53 |
+ set(XINE_VERSION_OK TRUE) |
| 54 |
+ string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) |
| 55 |
+-- |
| 56 |
+1.7.8.2 |
| 57 |
+ |
| 58 |
|
| 59 |
diff --git a/kde-base/kdelibs/kdelibs-4.7.95.ebuild b/kde-base/kdelibs/kdelibs-4.7.95-r1.ebuild |
| 60 |
similarity index 99% |
| 61 |
rename from kde-base/kdelibs/kdelibs-4.7.95.ebuild |
| 62 |
rename to kde-base/kdelibs/kdelibs-4.7.95-r1.ebuild |
| 63 |
index 52a3998..34c63ee 100644 |
| 64 |
--- a/kde-base/kdelibs/kdelibs-4.7.95.ebuild |
| 65 |
+++ b/kde-base/kdelibs/kdelibs-4.7.95-r1.ebuild |
| 66 |
@@ -133,6 +133,7 @@ PATCHES=( |
| 67 |
"${FILESDIR}/${PN}-4.4.90-xslt.patch" |
| 68 |
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
| 69 |
"${FILESDIR}/${PN}-4.6.3-bytecode.patch" |
| 70 |
+ "${FILESDIR}/${PN}-4.7.4-xinelib12x.patch" |
| 71 |
) |
| 72 |
|
| 73 |
pkg_pretend() { |
| 74 |
|
| 75 |
diff --git a/kde-base/kdelibs/kdelibs-4.7.97.ebuild b/kde-base/kdelibs/kdelibs-4.7.97-r1.ebuild |
| 76 |
similarity index 99% |
| 77 |
rename from kde-base/kdelibs/kdelibs-4.7.97.ebuild |
| 78 |
rename to kde-base/kdelibs/kdelibs-4.7.97-r1.ebuild |
| 79 |
index 0fd4b57..b839f64 100644 |
| 80 |
--- a/kde-base/kdelibs/kdelibs-4.7.97.ebuild |
| 81 |
+++ b/kde-base/kdelibs/kdelibs-4.7.97-r1.ebuild |
| 82 |
@@ -133,6 +133,7 @@ PATCHES=( |
| 83 |
"${FILESDIR}/${PN}-4.4.90-xslt.patch" |
| 84 |
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
| 85 |
"${FILESDIR}/${PN}-4.6.3-bytecode.patch" |
| 86 |
+ "${FILESDIR}/${PN}-4.7.4-xinelib12x.patch" |
| 87 |
) |
| 88 |
|
| 89 |
pkg_pretend() { |
| 90 |
|
| 91 |
diff --git a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild |
| 92 |
index 763a9dd..21408f4 100644 |
| 93 |
--- a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild |
| 94 |
+++ b/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild |
| 95 |
@@ -133,6 +133,7 @@ PATCHES=( |
| 96 |
"${FILESDIR}/${PN}-4.4.90-xslt.patch" |
| 97 |
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
| 98 |
"${FILESDIR}/${PN}-4.6.3-bytecode.patch" |
| 99 |
+ "${FILESDIR}/${PN}-4.7.4-xinelib12x.patch" |
| 100 |
) |
| 101 |
|
| 102 |
pkg_pretend() { |
| 103 |
|
| 104 |
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild |
| 105 |
index 763a9dd..21408f4 100644 |
| 106 |
--- a/kde-base/kdelibs/kdelibs-9999.ebuild |
| 107 |
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild |
| 108 |
@@ -133,6 +133,7 @@ PATCHES=( |
| 109 |
"${FILESDIR}/${PN}-4.4.90-xslt.patch" |
| 110 |
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
| 111 |
"${FILESDIR}/${PN}-4.6.3-bytecode.patch" |
| 112 |
+ "${FILESDIR}/${PN}-4.7.4-xinelib12x.patch" |
| 113 |
) |
| 114 |
|
| 115 |
pkg_pretend() { |
Archives