From 8550f782287a94d0083ba9949958eb96f9bfc89a Mon Sep 17 00:00:00 2001 From: Alastair Tse Date: Sun, 3 Sep 2006 12:09:51 +0000 Subject: adding my un-virtualed version of libquicktime and openquicktine, and then adding gtk fix from bug #140516 svn path=/; revision=71 --- media-libs/libquicktime/Manifest | 20 +++++ .../files/digest-libquicktime-0.9.7-r2 | 3 + .../libquicktime/files/libquicktime-0.9.7-dv.patch | 17 ++++ .../files/libquicktime-0.9.7-no-gtk-fix.patch | 50 ++++++++++++ .../files/libquicktime-0.9.7-unrice.patch | 27 +++++++ .../libquicktime/libquicktime-0.9.7-r2.ebuild | 93 ++++++++++++++++++++++ media-libs/openquicktime/Manifest | 9 +++ .../files/digest-openquicktime-1.0-r2 | 6 ++ .../openquicktime/openquicktime-1.0-r2.ebuild | 47 +++++++++++ 9 files changed, 272 insertions(+) create mode 100644 media-libs/libquicktime/Manifest create mode 100644 media-libs/libquicktime/files/digest-libquicktime-0.9.7-r2 create mode 100644 media-libs/libquicktime/files/libquicktime-0.9.7-dv.patch create mode 100644 media-libs/libquicktime/files/libquicktime-0.9.7-no-gtk-fix.patch create mode 100644 media-libs/libquicktime/files/libquicktime-0.9.7-unrice.patch create mode 100644 media-libs/libquicktime/libquicktime-0.9.7-r2.ebuild create mode 100644 media-libs/openquicktime/Manifest create mode 100644 media-libs/openquicktime/files/digest-openquicktime-1.0-r2 create mode 100644 media-libs/openquicktime/openquicktime-1.0-r2.ebuild diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest new file mode 100644 index 0000000..54473c3 --- /dev/null +++ b/media-libs/libquicktime/Manifest @@ -0,0 +1,20 @@ +AUX libquicktime-0.9.7-dv.patch 651 RMD160 a9f2166e5d8605c3200c7ab9883c6dbb9097d2cd SHA1 9697bb59c041dddd7873c66e29d321a5f8b6002d SHA256 36b84242e05fa977de5b6a34d890fd86f3fb6c3ca551682139b7f53804dcc926 +MD5 71fde588b024e1d8c472afa0081010b9 files/libquicktime-0.9.7-dv.patch 651 +RMD160 a9f2166e5d8605c3200c7ab9883c6dbb9097d2cd files/libquicktime-0.9.7-dv.patch 651 +SHA256 36b84242e05fa977de5b6a34d890fd86f3fb6c3ca551682139b7f53804dcc926 files/libquicktime-0.9.7-dv.patch 651 +AUX libquicktime-0.9.7-no-gtk-fix.patch 1820 RMD160 a4c0b35d33ddd8c957a3761c46c3d1fbc4160db9 SHA1 09aeae1f34fba014beffb165e2041eb6312477b1 SHA256 81fa5b3fdc9e9be9ff64ce8c6e688a3d9201d1dff642a36a51810f675465b2e0 +MD5 6f65b62f8a829495925c6c4e0305fef6 files/libquicktime-0.9.7-no-gtk-fix.patch 1820 +RMD160 a4c0b35d33ddd8c957a3761c46c3d1fbc4160db9 files/libquicktime-0.9.7-no-gtk-fix.patch 1820 +SHA256 81fa5b3fdc9e9be9ff64ce8c6e688a3d9201d1dff642a36a51810f675465b2e0 files/libquicktime-0.9.7-no-gtk-fix.patch 1820 +AUX libquicktime-0.9.7-unrice.patch 871 RMD160 00db7ed14972216f37b79903120539cff7d69c10 SHA1 23944f7694e0d46aa68533108ab986bbe4d0b0f3 SHA256 d21e8f756f2c4f6465b63923594b26ae88ee167600bcb7fe01fddb005bb1457a +MD5 bafb8667d95f5399ac28bdb66161035d files/libquicktime-0.9.7-unrice.patch 871 +RMD160 00db7ed14972216f37b79903120539cff7d69c10 files/libquicktime-0.9.7-unrice.patch 871 +SHA256 d21e8f756f2c4f6465b63923594b26ae88ee167600bcb7fe01fddb005bb1457a files/libquicktime-0.9.7-unrice.patch 871 +DIST libquicktime-0.9.7.tar.gz 765719 RMD160 a886cbc714306d94977616de7221a19298fa251d SHA1 93346b8a9a411a4bdf97283fbf3ac8ed52252c73 SHA256 43b3b1b3a4ca24c2017f1fa0470425e522b59346b74203b39f9991f6a7b6085e +EBUILD libquicktime-0.9.7-r2.ebuild 2539 RMD160 1037d53297da739fa550cc5dd2d5fc82eea4a610 SHA1 0fcd69cf4a2cf5d664ee9c82b84f342361318ee9 SHA256 228e74c2f8dd414cc920dec686176bec636e78695cd373c2188f389e7ca4459d +MD5 0367db5ba59a8af80dd11bfd0744f78a libquicktime-0.9.7-r2.ebuild 2539 +RMD160 1037d53297da739fa550cc5dd2d5fc82eea4a610 libquicktime-0.9.7-r2.ebuild 2539 +SHA256 228e74c2f8dd414cc920dec686176bec636e78695cd373c2188f389e7ca4459d libquicktime-0.9.7-r2.ebuild 2539 +MD5 630f7e275f87dd0267c776c2200e7ba5 files/digest-libquicktime-0.9.7-r2 256 +RMD160 152d8cbe8500b984ea151f9753a137ce879b1dee files/digest-libquicktime-0.9.7-r2 256 +SHA256 472a7162078a0d4d6a44ae9a25a92be60a484c20dbeb4759ca0378b775782d38 files/digest-libquicktime-0.9.7-r2 256 diff --git a/media-libs/libquicktime/files/digest-libquicktime-0.9.7-r2 b/media-libs/libquicktime/files/digest-libquicktime-0.9.7-r2 new file mode 100644 index 0000000..ec2f326 --- /dev/null +++ b/media-libs/libquicktime/files/digest-libquicktime-0.9.7-r2 @@ -0,0 +1,3 @@ +MD5 e5c977567df59c876c50ac191bb1caf6 libquicktime-0.9.7.tar.gz 765719 +RMD160 a886cbc714306d94977616de7221a19298fa251d libquicktime-0.9.7.tar.gz 765719 +SHA256 43b3b1b3a4ca24c2017f1fa0470425e522b59346b74203b39f9991f6a7b6085e libquicktime-0.9.7.tar.gz 765719 diff --git a/media-libs/libquicktime/files/libquicktime-0.9.7-dv.patch b/media-libs/libquicktime/files/libquicktime-0.9.7-dv.patch new file mode 100644 index 0000000..d248d56 --- /dev/null +++ b/media-libs/libquicktime/files/libquicktime-0.9.7-dv.patch @@ -0,0 +1,17 @@ +Index: libquicktime-0.9.7/configure.ac +=================================================================== +--- libquicktime-0.9.7.orig/configure.ac ++++ libquicktime-0.9.7/configure.ac +@@ -264,7 +264,11 @@ have_libdv="false" + + LIBDV_REQUIRED="0.102" + +-PKG_CHECK_MODULES(LIBDV, libdv >= $LIBDV_REQUIRED, have_libdv="true", have_libdv="false") ++AC_ARG_WITH([libdv], AC_HELP_STRING([--with-libdv], [Build with libdv support (default: check)])) ++ ++if test "x$with_libdv" != "xno"; then ++ PKG_CHECK_MODULES(LIBDV, libdv >= $LIBDV_REQUIRED, have_libdv="true", have_libdv="false") ++fi + AC_SUBST(LIBDV_REQUIRED) + AC_SUBST(LIBDV_LIBS) + AC_SUBST(LIBDV_CFLAGS) diff --git a/media-libs/libquicktime/files/libquicktime-0.9.7-no-gtk-fix.patch b/media-libs/libquicktime/files/libquicktime-0.9.7-no-gtk-fix.patch new file mode 100644 index 0000000..3c8f661 --- /dev/null +++ b/media-libs/libquicktime/files/libquicktime-0.9.7-no-gtk-fix.patch @@ -0,0 +1,50 @@ +diff -ur libquicktime-0.9.7/configure.ac libquicktime-0.9.7.patch/configure.ac +--- libquicktime-0.9.7/configure.ac 2006-08-17 01:34:50.000000000 -0400 ++++ libquicktime-0.9.7.patch/configure.ac 2006-08-17 01:36:08.000000000 -0400 +@@ -248,13 +248,16 @@ + dnl Check for gtk + dnl This is neccesary for the utils/gtk subdirectory + dnl +-GTK_REQUIRED="2.4.0" +-AM_PATH_GTK_2_0($GTK_REQUIRED, have_gtk=true, have_gtk=false) +-AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xtrue) +-AC_SUBST(GTK_REQUIRED) ++dnl GTK_REQUIRED="2.4.0" ++dnl AM_PATH_GTK_2_0($GTK_REQUIRED, have_gtk=true, have_gtk=false) ++dnl AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xtrue) ++dnl AC_SUBST(GTK_REQUIRED) ++AH_TEMPLATE([HAVE_GTK], [Do we have gtk installed?]) ++AC_DEFINE(HAVE_GTK, "false") ++AM_CONDITIONAL(HAVE_GTK, test "true" = "false") + + dnl Always be in sync with the newest gtk +-GTK_CFLAGS="$GTK_CFLAGS -DGTK_DISABLE_DEPRECATED" ++dnl GTK_CFLAGS="$GTK_CFLAGS -DGTK_DISABLE_DEPRECATED" + + dnl + dnl Check for libdv +@@ -610,8 +613,8 @@ + UTIL_LIBADD=../src/libquicktime.la + AC_SUBST(UTIL_LIBADD) + +-GTKUTIL_LIBADD=../../src/libquicktime.la +-AC_SUBST(GTKUTIL_LIBADD) ++dnl GTKUTIL_LIBADD=../../src/libquicktime.la ++dnl AC_SUBST(GTKUTIL_LIBADD) + + dnl Define flags for application to use. + +diff -ur libquicktime-0.9.7/utils/Makefile.in libquicktime-0.9.7.patch/utils/Makefile.in +--- libquicktime-0.9.7/utils/Makefile.in 2005-05-26 21:57:34.000000000 -0400 ++++ libquicktime-0.9.7.patch/utils/Makefile.in 2006-08-17 01:35:39.000000000 -0400 +@@ -126,7 +126,9 @@ + MANS = $(man1_MANS) + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = gtk ++@HAVE_GTK_FALSE@dist_gtk_subdirs = ++@HAVE_GTK_TRUE@dist_gtk_subdirs = gtk ++DIST_SUBDIRS = $(dist_gtk_subdirs) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALSA_CFLAGS = @ALSA_CFLAGS@ diff --git a/media-libs/libquicktime/files/libquicktime-0.9.7-unrice.patch b/media-libs/libquicktime/files/libquicktime-0.9.7-unrice.patch new file mode 100644 index 0000000..825b98c --- /dev/null +++ b/media-libs/libquicktime/files/libquicktime-0.9.7-unrice.patch @@ -0,0 +1,27 @@ +Index: libquicktime-0.9.7/configure.ac +=================================================================== +--- libquicktime-0.9.7.orig/configure.ac ++++ libquicktime-0.9.7/configure.ac +@@ -581,11 +581,11 @@ dnl + dnl Build CFLAGS + dnl + +-COMMON_CFLAGS="-finline-functions -Wall -Winline" ++COMMON_CFLAGS="-Wall -Winline" + + dnl Optimizing flags + +-LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer"]) ++LQT_OPT_CFLAGS($host_cpu) + + AH_TEMPLATE([NDEBUG], + [Causes debug code to e removed]) +@@ -594,7 +594,7 @@ if test x$LQT_DEBUG != xtrue; then + AC_DEFINE(NDEBUG) + fi + +-CFLAGS="$OPT_CFLAGS $COMMON_CFLAGS" ++CFLAGS="$CFLAGS $OPT_CFLAGS $COMMON_CFLAGS" + + # -L is required so that linker can find libquicktime when DESTDIR is used. + # libtool bug, documented at: http://www.geocrawler.com/mail/thread.php3?subject=install+phase+fails&list=404 diff --git a/media-libs/libquicktime/libquicktime-0.9.7-r2.ebuild b/media-libs/libquicktime/libquicktime-0.9.7-r2.ebuild new file mode 100644 index 0000000..1a10348 --- /dev/null +++ b/media-libs/libquicktime/libquicktime-0.9.7-r2.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild,v 1.16 2006/08/08 22:38:52 wolf31o2 Exp $ + +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="-*" + +IUSE="gtk jpeg mmx vorbis png dv ieee1394 X" + +DEPEND=">=sys-apps/sed-4.0.5 + dv? ( media-libs/libdv ) + gtk? ( >=x11-libs/gtk+-2.4.0 ) + png? ( media-libs/libpng ) + jpeg? ( media-libs/jpeg ) + vorbis? ( media-libs/libvorbis ) + ieee1394? ( + sys-libs/libavc1394 + sys-libs/libraw1394 + ) + X? ( || ( ( x11-libs/libXaw + x11-libs/libXv + x11-proto/xextproto + ) + virtual/x11 + ) + ) + !virtual/quicktime" + +PROVIDE="virtual/quicktime" + +pkg_setup() { + if has_version '=x11-base/xorg-x11-6*' && ! built_with_use x11-base/xorg-x11 xv; then + die "You need xv support to compile ${PN}." + fi +} + +src_unpack() { + unpack ${A} + + cd "${S}" + sed -i -e "s:\(have_libavcodec=\)true:\1false:g" configure.ac + epatch "${FILESDIR}/${P}-dv.patch" + epatch "${FILESDIR}/${P}-unrice.patch" + use gtk || epatch "${FILESDIR}/${P}-no-gtk-fix.patch" + + AT_M4DIR="m4" eautoreconf + elibtoolize +} + +src_compile() { + econf --enable-shared \ + --enable-static \ + $(use_enable mmx) \ + $(use_enable ieee1394 firewire) \ + $(use_with dv libdv) \ + $(use_with X x) \ + --without-cpuflags || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + # 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 + einfo "For compatibility with other quicktime libraries, ${PN} was" + einfo "going to create a /usr/include/quicktime symlink, but for some" + einfo "reason that is a directory on your system." + if $(has_version =media-libs/libquicktime-0.9.4); then + einfo "It seems this directory belongs to libquicktime-0.9.4." + einfo "We'll delete that directory now." + rm -rvf /usr/include/quicktime + else + einfo "Please check that is empty, and remove it, or submit a bug" + einfo "telling us which package owns the directory." + die "/usr/include/quicktime is a directory." + fi + fi +} diff --git a/media-libs/openquicktime/Manifest b/media-libs/openquicktime/Manifest new file mode 100644 index 0000000..f147289 --- /dev/null +++ b/media-libs/openquicktime/Manifest @@ -0,0 +1,9 @@ +DIST openquicktime-1.0-gcc34-1.patch.bz2 854 RMD160 03f900b141f1dc5f4a6eb914a2b2f95068e4a810 SHA1 f7c48c249b1316e8502cf6cc7a0aad0e20a4fae1 SHA256 ebe73da12fde10f60543a05c09ef742da918d6298fc7bb98a59fe0b52e49ef0f +DIST openquicktime-1.0-src.tgz 320144 RMD160 53c36cf87e48855460106cec8442ad004681be5c SHA1 1304ac28acb953351780dd3626fdb6a73f23c97f SHA256 27104245c2d450cc497c04e06294926e4d3d37f279a46dd3f7425ecb9dc088da +EBUILD openquicktime-1.0-r2.ebuild 1116 RMD160 238fb35164e61d63d4add55cd9a52d7818de6893 SHA1 2323430e8f1a7e348013d89f24d82f01c3218b4b SHA256 5ddb733a576bb1f5f82b12a3c97f8dee0b32346d585a0d4d0276266669e132c1 +MD5 4577e519f0c76eff80dc927a5c150535 openquicktime-1.0-r2.ebuild 1116 +RMD160 238fb35164e61d63d4add55cd9a52d7818de6893 openquicktime-1.0-r2.ebuild 1116 +SHA256 5ddb733a576bb1f5f82b12a3c97f8dee0b32346d585a0d4d0276266669e132c1 openquicktime-1.0-r2.ebuild 1116 +MD5 c0999572483d9b836c399a28ba7af5e7 files/digest-openquicktime-1.0-r2 533 +RMD160 4939d9844c023771d95942dacdf7b53f3b791fb5 files/digest-openquicktime-1.0-r2 533 +SHA256 82512de70f995f6e25e7d574dcfa727868f20d476c76f80387db854b47de1df6 files/digest-openquicktime-1.0-r2 533 diff --git a/media-libs/openquicktime/files/digest-openquicktime-1.0-r2 b/media-libs/openquicktime/files/digest-openquicktime-1.0-r2 new file mode 100644 index 0000000..aba31a7 --- /dev/null +++ b/media-libs/openquicktime/files/digest-openquicktime-1.0-r2 @@ -0,0 +1,6 @@ +MD5 293784d47543f3b94c17fb39042eb732 openquicktime-1.0-gcc34-1.patch.bz2 854 +RMD160 03f900b141f1dc5f4a6eb914a2b2f95068e4a810 openquicktime-1.0-gcc34-1.patch.bz2 854 +SHA256 ebe73da12fde10f60543a05c09ef742da918d6298fc7bb98a59fe0b52e49ef0f openquicktime-1.0-gcc34-1.patch.bz2 854 +MD5 f90bc78b8632c6c254cddf70b4726644 openquicktime-1.0-src.tgz 320144 +RMD160 53c36cf87e48855460106cec8442ad004681be5c openquicktime-1.0-src.tgz 320144 +SHA256 27104245c2d450cc497c04e06294926e4d3d37f279a46dd3f7425ecb9dc088da openquicktime-1.0-src.tgz 320144 diff --git a/media-libs/openquicktime/openquicktime-1.0-r2.ebuild b/media-libs/openquicktime/openquicktime-1.0-r2.ebuild new file mode 100644 index 0000000..8429a74 --- /dev/null +++ b/media-libs/openquicktime/openquicktime-1.0-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/openquicktime/openquicktime-1.0-r1.ebuild,v 1.13 2006/05/12 22:58:22 tcort Exp $ + +inherit flag-o-matic eutils +replace-flags "-fprefetch-loop-arrays" " " + +MY_P=${P}-src +S=${WORKDIR}/${MY_P} +DESCRIPTION="OpenQuicktime library for linux" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz + mirror://gentoo/openquicktime-1.0-gcc34-1.patch.bz2" +HOMEPAGE="http://www.openquicktime.org/" + +SLOT="0" +LICENSE="LGPL-2.1" +KEYWORDS="-*" +IUSE="" + +DEPEND="media-sound/lame + virtual/mpg123 + =dev-libs/glib-1* + media-libs/jpeg" + +src_unpack () { + unpack ${MY_P}.tgz + cd ${S} + if has_version '>=sys-devel/gcc-3.4'; then + epatch ${DISTDIR}/${P}-gcc34-1.patch.bz2 + fi +} + +src_compile() { + # debug is enabled by default... + econf --enable-debug=no || die + emake || die +} + +src_install() { + cd ${S} + dolib.so libopenquicktime.so + dodoc README AUTHORS NEWS TODO + dodir /usr/bin + einstall || die + mv ${D}/usr/bin/qtdump ${D}/usr/bin/qtdump-oq + mv ${D}/usr/bin/qtinfo ${D}/usr/bin/qtinfo-oq +} -- cgit v1.2.3-65-gdbad