From: Matthias Schwarzott Date: Wed, 6 Sep 2006 12:04:18 +0000 (+0000) Subject: Removing automagic dependency on quicktime and jpeg, see Bug #146243, Thanks to Polar... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f99a677bf812d18b77b1edafb637a53f7c0d21b3;p=gentoo.git Removing automagic dependency on quicktime and jpeg, see Bug #146243, Thanks to Polarina for providing first patch. Package-Manager: portage-2.1.1_rc1-r5 --- diff --git a/media-video/dvgrab/ChangeLog b/media-video/dvgrab/ChangeLog index 66c81dbf20f7..a787dd89e514 100644 --- a/media-video/dvgrab/ChangeLog +++ b/media-video/dvgrab/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/dvgrab # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.15 2006/07/06 23:11:39 squinky86 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.16 2006/09/06 12:04:18 zzam Exp $ + + 06 Sep 2006; Matthias Schwarzott + +files/dvgrab-1.8-configure.patch, dvgrab-1.8.ebuild: + Removing automagic dependency on quicktime and jpeg, see Bug #146243, Thanks + to Polarina for providing first patch. 06 Jul 2006; Jon Hood dvgrab-1.8.ebuild: Stable on amd64, bug #103926. diff --git a/media-video/dvgrab/Manifest b/media-video/dvgrab/Manifest index 455bcc657c88..c7c93842ca89 100644 --- a/media-video/dvgrab/Manifest +++ b/media-video/dvgrab/Manifest @@ -1,17 +1,24 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX dvgrab-1.8-configure.patch 2624 RMD160 848a9e7091a804fea8469e5aab9fb4e9b73581a6 SHA1 473e4542ac365f40e1eb5d16f38face70ccd1240 SHA256 1ce0ef77765e18294b85b4f024f85e0a8eadce643c36b414ec06f72a4cff745f +MD5 cd279c51e72b1507e90812d9ea453908 files/dvgrab-1.8-configure.patch 2624 +RMD160 848a9e7091a804fea8469e5aab9fb4e9b73581a6 files/dvgrab-1.8-configure.patch 2624 +SHA256 1ce0ef77765e18294b85b4f024f85e0a8eadce643c36b414ec06f72a4cff745f files/dvgrab-1.8-configure.patch 2624 DIST dvgrab-1.7.tar.gz 163596 DIST dvgrab-1.8.tar.gz 163695 RMD160 7db4fbd5341458d43f6d762a0c985a9beab923b8 SHA1 c73292c8f19a581883f1c0a536e06f646feb421f SHA256 b0a6d519307bacc95fb6a73f9ac359aa4c0b1fafd84a9c5fec57562b431aee4d EBUILD dvgrab-1.7.ebuild 737 RMD160 3d7f81ce19e292b5756da9f35ee70f6126043e08 SHA1 a9595da97250eecdb18e8e4838774d2941b20642 SHA256 fe38eea3246576aecb94f580bdb8b91ece84b085484e68043fad4392c4a7d73f MD5 10debb1def77296af7a434508702108d dvgrab-1.7.ebuild 737 RMD160 3d7f81ce19e292b5756da9f35ee70f6126043e08 dvgrab-1.7.ebuild 737 SHA256 fe38eea3246576aecb94f580bdb8b91ece84b085484e68043fad4392c4a7d73f dvgrab-1.7.ebuild 737 -EBUILD dvgrab-1.8.ebuild 716 RMD160 f8ca9b30857299706fda99f8cc7fef560b9fd5e2 SHA1 7b7370cdfdfaaf2a3a6c4e11b23c13b91249faad SHA256 bf6e87be8743ce66d9ac313611677231083622374510f3ff14c8e1ab11de36b2 -MD5 7cef8bf1e169db6921f3f0e35162197f dvgrab-1.8.ebuild 716 -RMD160 f8ca9b30857299706fda99f8cc7fef560b9fd5e2 dvgrab-1.8.ebuild 716 -SHA256 bf6e87be8743ce66d9ac313611677231083622374510f3ff14c8e1ab11de36b2 dvgrab-1.8.ebuild 716 -MISC ChangeLog 2200 RMD160 14f6f44672639abcb1ce5b2eaf234975205a0ead SHA1 2974144d21827a739e89d9514ab7a22da4b5ba1f SHA256 8cdfd1206b791dbb67860a75d8bae2aea94d730eabee043dda817754c52ce96c -MD5 fb2908adf4ed418eb174dc77e3c72216 ChangeLog 2200 -RMD160 14f6f44672639abcb1ce5b2eaf234975205a0ead ChangeLog 2200 -SHA256 8cdfd1206b791dbb67860a75d8bae2aea94d730eabee043dda817754c52ce96c ChangeLog 2200 +EBUILD dvgrab-1.8.ebuild 980 RMD160 6cddd2ace1e56537976ae02d3c589e7ffdc73386 SHA1 0abc40bbbad66f47a9d4df627eba53762de83158 SHA256 a277599d52c7a9da8381e48084032c541bc1fe5791ff3ef16d110cf5525d9bfe +MD5 6e5acd9f4bdb4f3de6605334b5446d0d dvgrab-1.8.ebuild 980 +RMD160 6cddd2ace1e56537976ae02d3c589e7ffdc73386 dvgrab-1.8.ebuild 980 +SHA256 a277599d52c7a9da8381e48084032c541bc1fe5791ff3ef16d110cf5525d9bfe dvgrab-1.8.ebuild 980 +MISC ChangeLog 2446 RMD160 3a4b31638f86538139c0e6d5499ab49bbe5793c2 SHA1 70deeae3371dc670d24f9cd038d91897e52955e8 SHA256 ea4e649ea827ef5fab54677d916368bfaa8261afad7eadb6cf4f706a5bb01298 +MD5 5864f6ea93e0c1fa2c40593dd199aaaf ChangeLog 2446 +RMD160 3a4b31638f86538139c0e6d5499ab49bbe5793c2 ChangeLog 2446 +SHA256 ea4e649ea827ef5fab54677d916368bfaa8261afad7eadb6cf4f706a5bb01298 ChangeLog 2446 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225 @@ -22,3 +29,10 @@ SHA256 06c4c9f8a97b837515820452267d251de1569a4e816f67253445c5472d60fdbf files/di MD5 6d7d9ab902b625057aa20ba33e394bad files/digest-dvgrab-1.8 232 RMD160 3a932674c29658ba53c23f32073b871d918706ef files/digest-dvgrab-1.8 232 SHA256 327fa62ec75524980cc5a965bd6b8f8d9b64f7faeb764b37128c02d7bed1b6be files/digest-dvgrab-1.8 232 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFE/rlPt2vP6XvVdOcRAm+PAKCOR+iYa1WZMAOMrQIjrm49e3ICAACfc7g0 +4AApAzGjPQcDhyLXbwGb4Fg= +=G9v8 +-----END PGP SIGNATURE----- diff --git a/media-video/dvgrab/dvgrab-1.8.ebuild b/media-video/dvgrab/dvgrab-1.8.ebuild index 035c558046ac..ad07edaaafa1 100644 --- a/media-video/dvgrab/dvgrab-1.8.ebuild +++ b/media-video/dvgrab/dvgrab-1.8.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-1.8.ebuild,v 1.7 2006/07/06 23:11:39 squinky86 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-1.8.ebuild,v 1.8 2006/09/06 12:04:18 zzam Exp $ -inherit eutils +inherit eutils autotools DESCRIPTION="Digital Video (DV) grabber for GNU/Linux" HOMEPAGE="http://kino.schirmacher.de/" @@ -17,6 +17,21 @@ DEPEND="sys-libs/libavc1394 >=media-libs/libdv-0.102 jpeg? ( media-libs/jpeg ) quicktime? ( media-libs/libquicktime )" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack ${A} + epatch ${FILESDIR}/${P}-configure.patch + cd ${S} + eautoreconf +} + +src_compile() { + econf $(use_with quicktime libquicktime) \ + $(use_with jpeg libjpeg) \ + || die "econf failed" + emake || die "emake failed" +} src_install () { make DESTDIR=${D} install || die "make install failed" diff --git a/media-video/dvgrab/files/dvgrab-1.8-configure.patch b/media-video/dvgrab/files/dvgrab-1.8-configure.patch new file mode 100644 index 000000000000..0d362b5aeb19 --- /dev/null +++ b/media-video/dvgrab/files/dvgrab-1.8-configure.patch @@ -0,0 +1,78 @@ +--- dvgrab-1.8/configure.in.old 2006-09-06 13:29:08.632750806 +0200 ++++ dvgrab-1.8/configure.in 2006-09-06 13:32:20.919348163 +0200 +@@ -67,37 +67,46 @@ + AC_WARN(libdv missing; I make better dv2 AVI files with libdv 0.98 or newer installed.) + ]) + +-AC_CHECK_HEADERS(quicktime/quicktime.h,, +-[ +- AC_WARN(quicktime headers missing; install libquicktime or quicktime4linux to support Quicktime files.) +-]) ++AC_ARG_WITH(libquicktime, [ --with-libquicktime Enables Quicktime support], ++[enable_libquicktime=$withval], [enable_libquicktime=yes]) + +-# add various libs if using quicktime4linux and not libquicktime +-AC_CHECK_HEADERS(quicktime/lqt.h, +- [AC_CHECK_LIB(quicktime, quicktime_open, , +- [AC_WARN(libquicktime missing; install libquicktime or quicktime4linux to support Quicktime files.)] +- )], +-[ +- AC_CHECK_LIB(png, png_read_image) +- AC_CHECK_LIB(ogg, ogg_stream_pagein) +- AC_CHECK_LIB(vorbis, vorbis_info_clear) +- AC_CHECK_LIB(vorbisenc, vorbis_encode_ctl) +- AC_CHECK_LIB(jpeg, jpeg_read_scanlines) +- AC_CHECK_LIB(a52, a52_init) +- AC_CHECK_LIB(mpeg3, mpeg3demux_read_char_packet) +- AC_CHECK_LIB(quicktime, quicktime_open, , +- [AC_WARN(libquicktime missing; install libquicktime or quicktime4linux to support Quicktime files.)] +- ) +-]) ++if test "$enable_libquicktime" = yes; then ++ AC_CHECK_HEADERS(quicktime/quicktime.h,, ++ [ ++ AC_ERROR(quicktime headers missing) ++ ]) ++ ++ AC_CHECK_HEADERS(quicktime/lqt.h, ++ [AC_CHECK_LIB(quicktime, quicktime_open, , ++ [AC_ERROR(libquicktime missing)] ++ )], ++ [ ++ AC_CHECK_LIB(png, png_read_image) ++ AC_CHECK_LIB(ogg, ogg_stream_pagein) ++ AC_CHECK_LIB(vorbis, vorbis_info_clear) ++ AC_CHECK_LIB(vorbisenc, vorbis_encode_ctl) ++ AC_CHECK_LIB(jpeg, jpeg_read_scanlines) ++ AC_CHECK_LIB(a52, a52_init) ++ AC_CHECK_LIB(mpeg3, mpeg3demux_read_char_packet) ++ AC_CHECK_LIB(quicktime, quicktime_open, , ++ [AC_ERROR(libquicktime missing)] ++ ) ++ ]) ++fi + +-AC_CHECK_HEADERS(jpeglib.h,, +-[ +- AC_WARN(jpeglib headers missing; install jpeglib to save to JPEG files.) +-]) +-AC_CHECK_LIB(jpeg, jpeg_CreateCompress,, +-[ +- AC_WARN(jpeglib missing; install jpeglib to save to JPEG files.) +-]) ++AC_ARG_WITH(libjpeg, [ --with-libjpeg Enables JPEG support], ++[enable_libjpeg=$withval], [enable_libjpeg=yes]) ++ ++if test "$enable_libjpeg" = yes; then ++ AC_CHECK_HEADERS(jpeglib.h,, ++ [ ++ AC_WARN(jpeglib headers missing; install jpeglib to save to JPEG files.) ++ ]) ++ AC_CHECK_LIB(jpeg, jpeg_CreateCompress,, ++ [ ++ AC_WARN(jpeglib missing; install jpeglib to save to JPEG files.) ++ ]) ++fi + + # EFENCE + AC_ARG_WITH(efence,[ --with-efence Use ElectricFence for debugging support.],