diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-10-10 19:58:16 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-10-10 19:58:16 +0000 |
| commit | 73f9005f104b3327f7d8152756914360873ec652 (patch) | |
| tree | c9bd886e1db6333964d771008576075748b827d6 /media-libs/libdvdnav/files | |
| parent | Update boost masking (diff) | |
| download | historical-73f9005f104b3327f7d8152756914360873ec652.tar.gz historical-73f9005f104b3327f7d8152756914360873ec652.tar.bz2 historical-73f9005f104b3327f7d8152756914360873ec652.zip | |
old
Package-Manager: portage-2.2.0_alpha64/cvs/Linux x86_64
Diffstat (limited to 'media-libs/libdvdnav/files')
| -rw-r--r-- | media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch | 33 | ||||
| -rw-r--r-- | media-libs/libdvdnav/files/libdvdnav-0.1.10-dontbuild-examples.patch | 34 |
2 files changed, 0 insertions, 67 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 deleted file mode 100644 index 4d439c175d52..000000000000 --- a/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -Use CFLAGS from environment and make sure we install the .m4 into the -correct place regardless of whether `aclocal` is installed on the host. -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" - - AC_SUBST(DEBUG_CFLAGS) - -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 - --if INSTALL_M4 --m4datadir = @ACLOCAL_DIR@ --else - m4datadir = $(datadir)/aclocal --endif - - m4data_DATA = dvdnav.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 deleted file mode 100644 index ff916c7552de..000000000000 --- a/media-libs/libdvdnav/files/libdvdnav-0.1.10-dontbuild-examples.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 \ |