diff options
author | Alexis Ballier <aballier@gentoo.org> | 2008-01-02 13:59:36 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2008-01-02 13:59:36 +0000 |
commit | f3e671d7f496dd50f64ff15787a54e8534e5c9bc (patch) | |
tree | af6c3fc538781019e6739c9806559b3aaffc604c /media-libs | |
parent | Stable on alpha, bug #203573 (diff) | |
download | gentoo-2-f3e671d7f496dd50f64ff15787a54e8534e5c9bc.tar.gz gentoo-2-f3e671d7f496dd50f64ff15787a54e8534e5c9bc.tar.bz2 gentoo-2-f3e671d7f496dd50f64ff15787a54e8534e5c9bc.zip |
Fix pkg-config initialisation when alsa is not used, fix nls build with as-needed on non glibc systems, add missing dep on virtual/libintl for non glibc systems
(Portage version: 2.1.4_rc14)
Diffstat (limited to 'media-libs')
5 files changed, 150 insertions, 2 deletions
diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog index 70f8d7d982b0..041d43148143 100644 --- a/media-libs/libquicktime/ChangeLog +++ b/media-libs/libquicktime/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-libs/libquicktime -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.98 2007/12/25 17:19:28 phreak Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.99 2008/01/02 13:59:35 aballier Exp $ + +*libquicktime-1.0.1-r1 (02 Jan 2008) + + 02 Jan 2008; Alexis Ballier <aballier@gentoo.org> + +files/libquicktime-1.0.1-nls-asneeded.patch, + +files/libquicktime-1.0.1-pkgconfig_init.patch, + +libquicktime-1.0.1-r1.ebuild: + Fix pkg-config initialisation when alsa is not used, fix nls build with + as-needed on non glibc systems, add missing dep on virtual/libintl for non + glibc systems 25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml: Removing zypher from metadata.xml as per #26909. diff --git a/media-libs/libquicktime/files/digest-libquicktime-1.0.1-r1 b/media-libs/libquicktime/files/digest-libquicktime-1.0.1-r1 new file mode 100644 index 000000000000..1a932e42fe39 --- /dev/null +++ b/media-libs/libquicktime/files/digest-libquicktime-1.0.1-r1 @@ -0,0 +1,3 @@ +MD5 3146ef9f88ea6a887658ceadac317997 libquicktime-1.0.1.tar.gz 995539 +RMD160 18c6349573e5b76dfb671d2813ae68fb877980fa libquicktime-1.0.1.tar.gz 995539 +SHA256 2d1cf4548b1787b23c8405f47f392d3028db074efb605ab990a9e9ede86c7f2d libquicktime-1.0.1.tar.gz 995539 diff --git a/media-libs/libquicktime/files/libquicktime-1.0.1-nls-asneeded.patch b/media-libs/libquicktime/files/libquicktime-1.0.1-nls-asneeded.patch new file mode 100644 index 000000000000..45af9816659a --- /dev/null +++ b/media-libs/libquicktime/files/libquicktime-1.0.1-nls-asneeded.patch @@ -0,0 +1,13 @@ +Index: libquicktime-1.0.1/src/Makefile.am +=================================================================== +--- libquicktime-1.0.1.orig/src/Makefile.am ++++ libquicktime-1.0.1/src/Makefile.am +@@ -7,7 +7,7 @@ AM_CFLAGS = -DLOCALE_DIR=\"$(localedir)\ + # Library dependencies + # Maybe we need zlib to read compressed quicktime headers + # +-libquicktime_la_LIBADD = @ICONV_LIBS@ @LIBINTL@ ++libquicktime_la_LIBADD = @ICONV_LIBS@ @LTLIBINTL@ + + libquicktime_la_LDFLAGS = -export-dynamic + diff --git a/media-libs/libquicktime/files/libquicktime-1.0.1-pkgconfig_init.patch b/media-libs/libquicktime/files/libquicktime-1.0.1-pkgconfig_init.patch new file mode 100644 index 000000000000..d85b2e0163e2 --- /dev/null +++ b/media-libs/libquicktime/files/libquicktime-1.0.1-pkgconfig_init.patch @@ -0,0 +1,14 @@ +Index: libquicktime-1.0.1/configure.ac +=================================================================== +--- libquicktime-1.0.1.orig/configure.ac ++++ libquicktime-1.0.1/configure.ac +@@ -73,6 +73,9 @@ dnl + AM_GNU_GETTEXT([external]) + + ++PKG_PROG_PKG_CONFIG ++ ++ + dnl This is necessary for libtool assembler support + + AS=gcc diff --git a/media-libs/libquicktime/libquicktime-1.0.1-r1.ebuild b/media-libs/libquicktime/libquicktime-1.0.1-r1.ebuild new file mode 100644 index 000000000000..88e29ad6396e --- /dev/null +++ b/media-libs/libquicktime/libquicktime-1.0.1-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.0.1-r1.ebuild,v 1.1 2008/01/02 13:59:35 aballier Exp $ + +WANT_AUTOMAKE="latest" +WANT_AUTOCONF="latest" +inherit libtool eutils autotools + +DESCRIPTION="A library based on quicktime4linux with extensions" +HOMEPAGE="http://libquicktime.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE="mmx X opengl dv gtk alsa aac encode png jpeg vorbis lame x264 ffmpeg" + +RDEPEND="dv? ( media-libs/libdv ) + gtk? ( >=x11-libs/gtk+-2.4.0 ) + aac? ( + media-libs/faad2 + encode? ( media-libs/faac ) + ) + alsa? ( media-libs/alsa-lib ) + png? ( media-libs/libpng ) + jpeg? ( media-libs/jpeg ) + vorbis? ( media-libs/libvorbis media-libs/libogg ) + lame? ( media-sound/lame ) + ffmpeg? ( media-video/ffmpeg ) + x264? ( >=media-libs/x264-svn-20060810 ) + X? ( x11-libs/libXaw + x11-libs/libXv + x11-libs/libXext + x11-libs/libX11 + opengl? ( media-libs/mesa ) + ) + virtual/libintl + !virtual/quicktime" +DEPEND="${RDEPEND} + X? ( + x11-proto/videoproto + x11-proto/xextproto + ) + dev-util/pkgconfig + sys-devel/gettext" + +PROVIDE="virtual/quicktime" + + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-pkgconfig_init.patch" + epatch "${FILESDIR}/${P}-nls-asneeded.patch" + # Copy config.rapth to avoid failures.. + cp /usr/share/gettext/config.rpath . + AT_M4DIR="m4" eautoreconf +} +src_compile() { + local MY_OPTS="" + if use !encode || use !aac; then + MY_OPTS="--without-faac" + fi + + econf --enable-shared \ + --enable-static \ + --enable-gpl \ + $(use_enable mmx) \ + $(use_with X x) \ + $(use_with gtk) \ + $(use_with dv libdv) \ + $(use_with alsa) \ + $(use_with aac faad2) \ + $(use_with png libpng) \ + $(use_with jpeg libjpeg) \ + $(use vorbis || echo "--without-vorbis") \ + $(use_with lame) \ + $(use_with x264) \ + $(use_with ffmpeg) \ + $(use_with opengl) \ + ${MY_OPTS} \ + --without-cpuflags || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc README TODO ChangeLog + # Compatibility with software that uses quicktime prefix, but + # don't do that when building for Darwin/MacOS + [[ ${CHOST} != *-darwin* ]] && \ + dosym /usr/include/lqt /usr/include/quicktime +} + +pkg_preinst() { + if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then + elog "For compatibility with other quicktime libraries, ${PN} was" + elog "going to create a /usr/include/quicktime symlink, but for some" + elog "reason that is a directory on your system." + + elog "Please check that is empty, and remove it, or submit a bug" + elog "telling us which package owns the directory." + die "/usr/include/quicktime is a directory." + fi +} |