diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-06-16 11:44:04 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-06-16 11:44:04 +0000 |
| commit | 2115afc8499b4b32aa5b48818cd81ae8a6288686 (patch) | |
| tree | d3afc0901aaacdf57f0b1a581bb4c927394323e6 /media-libs/libdvdnav/files | |
| parent | stable amd64, security bug 227111 (diff) | |
| download | gentoo-2-2115afc8499b4b32aa5b48818cd81ae8a6288686.tar.gz gentoo-2-2115afc8499b4b32aa5b48818cd81ae8a6288686.tar.bz2 gentoo-2-2115afc8499b4b32aa5b48818cd81ae8a6288686.zip | |
Disable building of examples. Closes bug #226339
(Portage version: 2.1.5.5)
Diffstat (limited to 'media-libs/libdvdnav/files')
| -rw-r--r-- | media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch | 40 | ||||
| -rw-r--r-- | media-libs/libdvdnav/files/libdvdnav-0.1.10-dontbuild-examples.patch | 34 |
2 files changed, 56 insertions, 18 deletions
diff --git a/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch b/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch index 9c0bdda9e206..4d439c175d52 100644 --- a/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch +++ b/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch @@ -1,29 +1,33 @@ Use CFLAGS from environment and make sure we install the .m4 into the correct place regardless of whether `aclocal` is installed on the host. - ---- configure -+++ configure -@@ -21459,8 +21459,9 @@ - ;; - esac - +Index: libdvdnav-0.1.10/configure.ac +=================================================================== +--- libdvdnav-0.1.10.orig/configure.ac ++++ libdvdnav-0.1.10/configure.ac +@@ -175,8 +175,9 @@ dnl ------------------------------------ + dnl cflags + dnl --------------------------------------------- + dnl Common cflags for all platforms -CFLAGS="-O3 -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $CFLAGS" -DEBUG_CFLAGS="-g -DDEBUG $CFLAGS" -+CFLAGS="$CFLAGS -Wall" -+CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" -+DEBUG_CFLAGS="$CFLAGS -g -DDEBUG" - ++CFLAGS="${CFLAGS} -Wall" ++CPPFLAGS="${CPPFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" ++DEBUG_CFLAGS="${CFLAGS} -g -DDEBUG" + AC_SUBST(DEBUG_CFLAGS) ---- m4/Makefile.in -+++ m4/Makefile.in -@@ -116,8 +116,7 @@ +Index: libdvdnav-0.1.10/m4/Makefile.am +=================================================================== +--- libdvdnav-0.1.10.orig/m4/Makefile.am ++++ libdvdnav-0.1.10/m4/Makefile.am +@@ -2,10 +2,6 @@ include $(top_srcdir)/misc/Makefile.comm EXTRA_DIST = dvdnav.m4 --@INSTALL_M4_TRUE@m4datadir = @ACLOCAL_DIR@ --@INSTALL_M4_FALSE@m4datadir = $(datadir)/aclocal -+m4datadir = $(datadir)/aclocal +-if INSTALL_M4 +-m4datadir = @ACLOCAL_DIR@ +-else + m4datadir = $(datadir)/aclocal +-endif m4data_DATA = dvdnav.m4 - subdir = m4 diff --git a/media-libs/libdvdnav/files/libdvdnav-0.1.10-dontbuild-examples.patch b/media-libs/libdvdnav/files/libdvdnav-0.1.10-dontbuild-examples.patch new file mode 100644 index 000000000000..ff916c7552de --- /dev/null +++ b/media-libs/libdvdnav/files/libdvdnav-0.1.10-dontbuild-examples.patch @@ -0,0 +1,34 @@ +Index: libdvdnav-0.1.10/configure.ac +=================================================================== +--- libdvdnav-0.1.10.orig/configure.ac ++++ libdvdnav-0.1.10/configure.ac +@@ -171,6 +171,12 @@ case $host in + ;; + esac + ++AC_ARG_ENABLE([examples], ++ AS_HELP_STRING([--disable-examples], [Don't build examples during build phase]), ++ [enable_examples=$enableval], [enable_examples=yes]) ++ ++AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$enable_examples" = "xyes"]) ++ + dnl --------------------------------------------- + dnl cflags + dnl --------------------------------------------- +Index: libdvdnav-0.1.10/Makefile.am +=================================================================== +--- libdvdnav-0.1.10.orig/Makefile.am ++++ libdvdnav-0.1.10/Makefile.am +@@ -2,7 +2,11 @@ include $(top_srcdir)/misc/Makefile.comm + + AUTOMAKE_OPTIONS = 1.3 + +-SUBDIRS = src examples doc misc m4 ++SUBDIRS = src doc misc m4 ++ ++if BUILD_EXAMPLES ++SUBDIRS += examples ++endif + + DEBFILES = debian/README.Debian debian/bug-presubj debian/changelog \ + debian/control debian/copyright debian/dvdnav-config.1 \ |