diff options
| -rw-r--r-- | media-libs/libdvdnav/ChangeLog | 7 | ||||
| -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 | ||||
| -rw-r--r-- | media-libs/libdvdnav/libdvdnav-0.1.10.ebuild | 43 | ||||
| -rw-r--r-- | media-libs/libdvdread/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libdvdread/files/libdvdread-0.9.7-udfsymbols.patch | 19 | ||||
| -rw-r--r-- | media-libs/libdvdread/libdvdread-0.9.7.ebuild | 40 |
7 files changed, 10 insertions, 173 deletions
diff --git a/media-libs/libdvdnav/ChangeLog b/media-libs/libdvdnav/ChangeLog index 89cf7d21020d..131c78382a2e 100644 --- a/media-libs/libdvdnav/ChangeLog +++ b/media-libs/libdvdnav/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libdvdnav # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.58 2011/10/10 19:14:52 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.59 2011/10/10 19:56:13 ssuominen Exp $ + + 10 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -libdvdnav-0.1.10.ebuild, + -files/libdvdnav-0.1.10-build.patch, + -files/libdvdnav-0.1.10-dontbuild-examples.patch: + old *libdvdnav-4.2.0_pre1243 (10 Oct 2011) 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 \ diff --git a/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild b/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild deleted file mode 100644 index 100e9e6e8abc..000000000000 --- a/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild,v 1.19 2008/08/08 15:03:28 aballier Exp $ - -inherit eutils base autotools - -DESCRIPTION="Library for DVD navigation tools" -HOMEPAGE="http://sourceforge.net/projects/dvd/" -SRC_URI="mirror://sourceforge/dvd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND="media-libs/libdvdread" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-build.patch - "${FILESDIR}"/${P}-dontbuild-examples.patch -) - -src_unpack() { - base_src_unpack - cd "${S}" - - eautoreconf -} - -src_compile() { - econf \ - --disable-examples \ - --disable-dependency-tracking \ - || die "econf failed" - - emake || die "emake failed" -} - -src_install () { - emake DESTDIR="${D}" install || die - dodoc AUTHORS NEWS README -} diff --git a/media-libs/libdvdread/ChangeLog b/media-libs/libdvdread/ChangeLog index 2377c6f78fd3..f966d68fd68f 100644 --- a/media-libs/libdvdread/ChangeLog +++ b/media-libs/libdvdread/ChangeLog @@ -1,9 +1,10 @@ # ChangeLog for media-libs/libdvdread # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdread/ChangeLog,v 1.76 2011/10/10 19:16:05 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdread/ChangeLog,v 1.77 2011/10/10 19:58:16 ssuominen Exp $ - 10 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> - -files/libdvdread-0.9.6-udfsymbols.patch, -libdvdread-4.1.3_p1217.ebuild: + 10 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -libdvdread-0.9.7.ebuild, + -libdvdread-4.1.3_p1217.ebuild, -files/libdvdread-0.9.7-udfsymbols.patch, + -files/libdvdread-0.9.6-udfsymbols.patch: old *libdvdread-4.2.0_pre1243 (10 Oct 2011) diff --git a/media-libs/libdvdread/files/libdvdread-0.9.7-udfsymbols.patch b/media-libs/libdvdread/files/libdvdread-0.9.7-udfsymbols.patch deleted file mode 100644 index 30936e13ab42..000000000000 --- a/media-libs/libdvdread/files/libdvdread-0.9.7-udfsymbols.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- dvdread/Makefile.am.orig 2006-10-06 22:24:39.000000000 +0200 -+++ dvdread/Makefile.am 2006-10-06 22:25:35.000000000 +0200 -@@ -2,13 +2,13 @@ - - lib_LTLIBRARIES = libdvdread.la - libdvdread_la_SOURCES = dvd_input.c dvd_reader.c dvd_udf.c ifo_read.c \ -- ifo_print.c nav_read.c nav_print.c bswap.h dvd_udf.h dvd_input.h \ -+ ifo_print.c nav_read.c nav_print.c bswap.h dvd_input.h \ - dvdread_internal.h cmd_print.c \ - md5.c md5.h - libdvdread_la_LIBADD = @DL_LIBS@ @CSS_LIBS@ --libdvdread_la_LDFLAGS = -version-info 5:1:2 -export-symbols-regex "(DVD.*|ifo.*|nav.*|cmd.*)" -+libdvdread_la_LDFLAGS = -version-info 5:1:2 -export-symbols-regex "(DVD.*|UDF.*|ifo.*|nav.*|cmd.*)" - - pkgincludedir = $(includedir)/dvdread - --pkginclude_HEADERS = dvd_reader.h ifo_types.h ifo_read.h \ -+pkginclude_HEADERS = dvd_reader.h ifo_types.h ifo_read.h dvd_udf.h \ - ifo_print.h nav_types.h nav_read.h nav_print.h cmd_print.h diff --git a/media-libs/libdvdread/libdvdread-0.9.7.ebuild b/media-libs/libdvdread/libdvdread-0.9.7.ebuild deleted file mode 100644 index 9b7e1bfa30fd..000000000000 --- a/media-libs/libdvdread/libdvdread-0.9.7.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdread/libdvdread-0.9.7.ebuild,v 1.19 2009/12/28 09:32:36 lxnay Exp $ - -inherit eutils libtool autotools - -DESCRIPTION="Provides a simple foundation for reading DVD-Video images" -HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd/" -SRC_URI="http://www.dtek.chalmers.se/groups/dvd/dist/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="css" - -DEPEND="css? ( >=media-libs/libdvdcss-0.9.7 )" -RDEPEND="${DEPEND}" # libdvdcss is dlopened at runtime btw - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-udfsymbols.patch - eautoreconf -} - -src_compile() { - local myconf="" - econf ${myconf} || die "./configure failed" - emake || die "make failed" -} - -src_install() { - emake install DESTDIR="${D}" || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README TODO - - # install executables - dobin src/.libs/* || die - cd "${D}"/usr/bin - mv ifo_dump ifo_dump_dvdread || die -} |