1 |
commit: 4f0f34e1fa0a61350d2229719c18984b231f4fee |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Dec 30 14:20:04 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 4 10:13:26 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0f34e1 |
7 |
|
8 |
media-libs/libdvdnav: remove unused patch |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/3286 |
11 |
|
12 |
.../files/libdvdnav-4.2.0-pkgconfig.patch | 54 ---------------------- |
13 |
1 file changed, 54 deletions(-) |
14 |
|
15 |
diff --git a/media-libs/libdvdnav/files/libdvdnav-4.2.0-pkgconfig.patch b/media-libs/libdvdnav/files/libdvdnav-4.2.0-pkgconfig.patch |
16 |
deleted file mode 100644 |
17 |
index 0edcab9..00000000 |
18 |
--- a/media-libs/libdvdnav/files/libdvdnav-4.2.0-pkgconfig.patch |
19 |
+++ /dev/null |
20 |
@@ -1,54 +0,0 @@ |
21 |
-http://lists.mplayerhq.hu/pipermail/dvdnav-discuss/2012-March/001672.html |
22 |
- |
23 |
-use pkg-config for libdvdread by default rather than the ugly xxx-config scripts |
24 |
- |
25 |
-https://bugs.gentoo.org/410189 |
26 |
- |
27 |
-hassle vapier@g.o if this causes issues |
28 |
- |
29 |
---- configure.ac (revision 1243) |
30 |
-+++ configure.ac (working copy) |
31 |
-@@ -89,6 +89,7 @@ AC_PROG_CC |
32 |
- AC_PROG_MAKE_SET |
33 |
- AC_PROG_INSTALL |
34 |
- AC_PROG_LN_S |
35 |
-+PKG_PROG_PKG_CONFIG |
36 |
- |
37 |
- dnl -------------------------------------------------------------- |
38 |
- dnl Libtool |
39 |
-@@ -185,15 +186,26 @@ AC_ARG_WITH([dvdread-config], |
40 |
- [AS_HELP_STRING([--with-dvdread-config=PROG], |
41 |
- [dvdread-config program to use @<:@default=from PATH@:>@])], |
42 |
- [DVDREAD_CONFIG="$withval"], |
43 |
-- [dnl User didn't specify program, search PATH |
44 |
-- AC_PATH_PROG([DVDREAD_CONFIG], [dvdread-config], [no]) |
45 |
-- test "x$DVDREAD_CONFIG" = xno && \ |
46 |
-- AC_MSG_ERROR([dvdread-config required to link with libdvdread]) |
47 |
-- ]) |
48 |
--DVDREAD_CFLAGS=`$DVDREAD_CONFIG --cflags` || \ |
49 |
-- AC_MSG_ERROR([Could not get libdvdread CFLAGS from $DVDREAD_CONFIG]) |
50 |
--DVDREAD_LIBS=`$DVDREAD_CONFIG --libs` || \ |
51 |
-- AC_MSG_ERROR([Could not get libdvdread LIBS from $DVDREAD_CONFIG]) |
52 |
-+ [DVDREAD_CONFIG=""]) |
53 |
-+ |
54 |
-+dnl by default, search pkg-config, and then fall back to dvdread-config |
55 |
-+DVDREAD_PKG_CONFIG="no" |
56 |
-+if test "x$DVDREAD_CONFIG" = "x"; then |
57 |
-+ PKG_CHECK_MODULES([DVDREAD], [dvdread], |
58 |
-+ [DVDREAD_PKG_CONFIG="yes"], |
59 |
-+ [dnl User didn't specify program, search PATH |
60 |
-+ AC_PATH_PROG([DVDREAD_CONFIG], [dvdread-config], [no]) |
61 |
-+ test "x$DVDREAD_CONFIG" = xno && \ |
62 |
-+ AC_MSG_ERROR([dvdread-config required to link with libdvdread]) |
63 |
-+ ]) |
64 |
-+fi |
65 |
-+if test "x$DVDREAD_PKG_CONFIG" != "xyes"; then |
66 |
-+ DVDREAD_CFLAGS=`$DVDREAD_CONFIG --cflags` || \ |
67 |
-+ AC_MSG_ERROR([Could not get libdvdread CFLAGS from $DVDREAD_CONFIG]) |
68 |
-+ DVDREAD_LIBS=`$DVDREAD_CONFIG --libs` || \ |
69 |
-+ AC_MSG_ERROR([Could not get libdvdread LIBS from $DVDREAD_CONFIG]) |
70 |
-+fi |
71 |
-+ |
72 |
- AC_SUBST([DVDREAD_CFLAGS]) |
73 |
- AC_SUBST([DVDREAD_LIBS]) |
74 |
- |