From 6d92ea1f646666ababdcbb18cb197576d28bd6fe Mon Sep 17 00:00:00 2001 From: Ian Whyman Date: Sun, 20 Jan 2013 16:28:11 +0000 Subject: Fix #446922, thanks to Bradley Broom for the patch (Portage version: 2.2.0_alpha157/cvs/Linux x86_64, unsigned Manifest commit) --- net-misc/mediatomb/ChangeLog | 11 +- .../mediatomb-0.12.1-avformatcontext-pointer.patch | 19 +++ net-misc/mediatomb/mediatomb-0.12.1-r4.ebuild | 138 -------------------- net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild | 139 +++++++++++++++++++++ 4 files changed, 167 insertions(+), 140 deletions(-) create mode 100644 net-misc/mediatomb/files/mediatomb-0.12.1-avformatcontext-pointer.patch delete mode 100644 net-misc/mediatomb/mediatomb-0.12.1-r4.ebuild create mode 100644 net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild (limited to 'net-misc/mediatomb') diff --git a/net-misc/mediatomb/ChangeLog b/net-misc/mediatomb/ChangeLog index d382426a0371..454108933498 100644 --- a/net-misc/mediatomb/ChangeLog +++ b/net-misc/mediatomb/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/mediatomb -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.40 2012/11/25 15:16:05 lu_zero Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.41 2013/01/20 16:28:11 thev00d00 Exp $ + +*mediatomb-0.12.1-r5 (20 Jan 2013) + + 20 Jan 2013; Ian Whyman + +files/mediatomb-0.12.1-avformatcontext-pointer.patch, + +mediatomb-0.12.1-r5.ebuild, -mediatomb-0.12.1-r4.ebuild: + Fix #446922, thanks to Bradley Broom for the patch 25 Nov 2012; Luca Barbato mediatomb-0.12.1-r4.ebuild, +files/mediatomb-0.12.1-libav9.patch, diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-avformatcontext-pointer.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-avformatcontext-pointer.patch new file mode 100644 index 000000000000..ab3e7cf7e17d --- /dev/null +++ b/net-misc/mediatomb/files/mediatomb-0.12.1-avformatcontext-pointer.patch @@ -0,0 +1,19 @@ +When opening a file to check its avformat, the AVFormatContext pointer was +not initialized to NULL before it was passed by reference to the open +function. + +Patch by Bradley Broom + +https://bugs.gentoo.org/show_bug.cgi?id=446922 + +--- mediatomb-0.12.1/src/metadata/ffmpeg_handler.cc ++++ mediatomb-0.12.1/src/metadata/ffmpeg_handler.cc +@@ -281,7 +281,7 @@ + int x = 0; + int y = 0; + +- AVFormatContext *pFormatCtx; ++ AVFormatContext *pFormatCtx = NULL; + + // Suppress all log messages + av_log_set_callback(FfmpegNoOutputStub); diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r4.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r4.ebuild deleted file mode 100644 index 8dac38434756..000000000000 --- a/net-misc/mediatomb/mediatomb-0.12.1-r4.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r4.ebuild,v 1.2 2012/11/25 15:16:05 lu_zero Exp $ - -EAPI="4" -inherit autotools eutils linux-info user - -DEB_VER="4" -DESCRIPTION="MediaTomb is an open source UPnP MediaServer" -HOMEPAGE="http://www.mediatomb.cc/" -SRC_URI="mirror://sourceforge/mediatomb/${P}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_VER}.debian.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="+curl debug +exif +ffmpeg id3tag inotify +javascript lastfm libextractor +magic +mp4 mysql +sqlite +taglib thumbnail +zlib" -REQUIRED_USE=" - || ( mysql sqlite ) - taglib? ( !id3tag ) id3tag? ( !taglib ) -" - -DEPEND="mysql? ( virtual/mysql ) - id3tag? ( media-libs/id3lib ) - javascript? ( >=dev-lang/spidermonkey-1.8.5 ) - dev-libs/expat - taglib? ( media-libs/taglib ) - sqlite? ( >=dev-db/sqlite-3 ) - lastfm? ( >=media-libs/lastfmlib-0.4 ) - exif? ( media-libs/libexif ) - libextractor? ( media-libs/libextractor ) - mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 ) - ffmpeg? ( virtual/ffmpeg ) - thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) - curl? ( net-misc/curl ) - magic? ( sys-apps/file ) - sys-apps/util-linux - zlib? ( sys-libs/zlib ) - virtual/libiconv" -RDEPEND="${DEPEND}" - -pkg_setup() { - if use inotify ; then - if ! linux_config_exists || ! linux_chkconfig_present INOTIFY_USER ; then - ewarn "Please enable Inotify support in your kernel:" - ewarn " File systems --->" - ewarn " [*] Inotify support for userspace" - fi - fi - enewgroup mediatomb - enewuser mediatomb -1 -1 /dev/null mediatomb -} - -src_prepare() { - local p dd="${WORKDIR}"/debian/patches - sed -i -r '/^[-+]{3} /s:[.][.]/::' "${dd}"/* || die - for p in $(<"${dd}"/series) ; do - epatch "${dd}"/${p} - done - epatch "${FILESDIR}"/${P}-libmp4v2.patch - epatch "${FILESDIR}"/${P}-system-uuid.patch #270830 - if has_version ">=dev-lang/spidermonkey-1.8.7" ; then - epatch "${FILESDIR}"/${P}-mozjs187.patch #435394 - fi - epatch "${FILESDIR}"/${P}-libextractor.patch #435394 - epatch "${FILESDIR}"/${P}-inotify-hard-links.patch - epatch "${FILESDIR}"/${P}-thumb-cache.patch - epatch "${FILESDIR}"/${P}-libav9.patch - epatch "${FILESDIR}"/${P}-no-thumbnail.patch - eautoreconf -} - -src_configure() { - local myconf=() - if use thumbnail ; then - elog "libextrator does not work with thumbnail, disabling libextrator" - myconf+=( --enable-ffmpegthumbnailer --enable-ffmpeg --disable-libextractor ) - elif ! use thumbnail && use ffmpeg && use libextractor ; then - elog "libextrator does not work with ffmpeg, disabling libextrator" - myconf+=( --disable-ffmpegthumbnailer --enable-ffmpeg --disable-libextractor ) - else - myconf+=( - $(use_enable thumbnail ffmpegthumbnailer) - $(use_enable ffmpeg) - $(use_enable libextractor) - ) - fi - - econf \ - $(use_enable curl) $(use_enable curl youtube) \ - $(use_enable debug tombdebug) \ - $(use_enable exif libexif) \ - $(use_enable id3tag id3lib) \ - $(use_enable inotify) \ - $(use_enable javascript libjs) \ - $(use_enable lastfm lastfmlib) \ - $(use_enable magic libmagic) \ - $(use_enable mp4 libmp4v2) \ - $(use_enable mysql) \ - $(use_enable sqlite sqlite3) \ - $(use_enable taglib) \ - $(use_enable zlib) \ - --enable-external-transcoding \ - --enable-protocolinfo-extension \ - "${myconf[@]}" -} - -src_install() { - default - - newinitd "${FILESDIR}"/${PN}-0.12.1.initd ${PN} - use mysql || sed -i -e "/use mysql/d" "${ED}"/etc/init.d/${PN} - newconfd "${FILESDIR}"/${PN}-0.12.0.confd ${PN} - - insinto /etc/mediatomb - newins "${FILESDIR}/${PN}-0.12.0.config" config.xml - fperms 0600 /etc/mediatomb/config.xml - fowners mediatomb:mediatomb /etc/mediatomb/config.xml - - keepdir /var/lib/mediatomb - fowners mediatomb:mediatomb /var/lib/mediatomb -} - -pkg_postinst() { - if use mysql ; then - elog "MediaTomb has been built with MySQL support and needs" - elog "to be configured before being started." - elog "For more information, please consult the MediaTomb" - elog "documentation: http://mediatomb.cc/pages/documentation" - elog - fi - - elog "To configure MediaTomb edit:" - elog "/etc/mediatomb/config.xml" - elog - elog "The MediaTomb web interface can be reached at (after the service is started):" - elog "http://localhost:49152/" -} diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild new file mode 100644 index 000000000000..33c8b3ee41fd --- /dev/null +++ b/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild,v 1.1 2013/01/20 16:28:11 thev00d00 Exp $ + +EAPI="4" +inherit autotools eutils linux-info user + +DEB_VER="4" +DESCRIPTION="MediaTomb is an open source UPnP MediaServer" +HOMEPAGE="http://www.mediatomb.cc/" +SRC_URI="mirror://sourceforge/mediatomb/${P}.tar.gz + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_VER}.debian.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="+curl debug +exif +ffmpeg id3tag inotify +javascript lastfm libextractor +magic +mp4 mysql +sqlite +taglib thumbnail +zlib" +REQUIRED_USE=" + || ( mysql sqlite ) + taglib? ( !id3tag ) id3tag? ( !taglib ) +" + +DEPEND="mysql? ( virtual/mysql ) + id3tag? ( media-libs/id3lib ) + javascript? ( >=dev-lang/spidermonkey-1.8.5 ) + dev-libs/expat + taglib? ( media-libs/taglib ) + sqlite? ( >=dev-db/sqlite-3 ) + lastfm? ( >=media-libs/lastfmlib-0.4 ) + exif? ( media-libs/libexif ) + libextractor? ( media-libs/libextractor ) + mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 ) + ffmpeg? ( virtual/ffmpeg ) + thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) + curl? ( net-misc/curl ) + magic? ( sys-apps/file ) + sys-apps/util-linux + zlib? ( sys-libs/zlib ) + virtual/libiconv" +RDEPEND="${DEPEND}" + +pkg_setup() { + if use inotify ; then + if ! linux_config_exists || ! linux_chkconfig_present INOTIFY_USER ; then + ewarn "Please enable Inotify support in your kernel:" + ewarn " File systems --->" + ewarn " [*] Inotify support for userspace" + fi + fi + enewgroup mediatomb + enewuser mediatomb -1 -1 /dev/null mediatomb +} + +src_prepare() { + local p dd="${WORKDIR}"/debian/patches + sed -i -r '/^[-+]{3} /s:[.][.]/::' "${dd}"/* || die + for p in $(<"${dd}"/series) ; do + epatch "${dd}"/${p} + done + epatch "${FILESDIR}"/${P}-libmp4v2.patch + epatch "${FILESDIR}"/${P}-system-uuid.patch #270830 + if has_version ">=dev-lang/spidermonkey-1.8.7" ; then + epatch "${FILESDIR}"/${P}-mozjs187.patch #435394 + fi + epatch "${FILESDIR}"/${P}-libextractor.patch #435394 + epatch "${FILESDIR}"/${P}-inotify-hard-links.patch + epatch "${FILESDIR}"/${P}-thumb-cache.patch + epatch "${FILESDIR}"/${P}-libav9.patch + epatch "${FILESDIR}"/${P}-no-thumbnail.patch + epatch "${FILESDIR}"/${P}-avformatcontext-pointer.patch #446922 + eautoreconf +} + +src_configure() { + local myconf=() + if use thumbnail ; then + elog "libextrator does not work with thumbnail, disabling libextrator" + myconf+=( --enable-ffmpegthumbnailer --enable-ffmpeg --disable-libextractor ) + elif ! use thumbnail && use ffmpeg && use libextractor ; then + elog "libextrator does not work with ffmpeg, disabling libextrator" + myconf+=( --disable-ffmpegthumbnailer --enable-ffmpeg --disable-libextractor ) + else + myconf+=( + $(use_enable thumbnail ffmpegthumbnailer) + $(use_enable ffmpeg) + $(use_enable libextractor) + ) + fi + + econf \ + $(use_enable curl) $(use_enable curl youtube) \ + $(use_enable debug tombdebug) \ + $(use_enable exif libexif) \ + $(use_enable id3tag id3lib) \ + $(use_enable inotify) \ + $(use_enable javascript libjs) \ + $(use_enable lastfm lastfmlib) \ + $(use_enable magic libmagic) \ + $(use_enable mp4 libmp4v2) \ + $(use_enable mysql) \ + $(use_enable sqlite sqlite3) \ + $(use_enable taglib) \ + $(use_enable zlib) \ + --enable-external-transcoding \ + --enable-protocolinfo-extension \ + "${myconf[@]}" +} + +src_install() { + default + + newinitd "${FILESDIR}"/${PN}-0.12.1.initd ${PN} + use mysql || sed -i -e "/use mysql/d" "${ED}"/etc/init.d/${PN} + newconfd "${FILESDIR}"/${PN}-0.12.0.confd ${PN} + + insinto /etc/mediatomb + newins "${FILESDIR}/${PN}-0.12.0.config" config.xml + fperms 0600 /etc/mediatomb/config.xml + fowners mediatomb:mediatomb /etc/mediatomb/config.xml + + keepdir /var/lib/mediatomb + fowners mediatomb:mediatomb /var/lib/mediatomb +} + +pkg_postinst() { + if use mysql ; then + elog "MediaTomb has been built with MySQL support and needs" + elog "to be configured before being started." + elog "For more information, please consult the MediaTomb" + elog "documentation: http://mediatomb.cc/pages/documentation" + elog + fi + + elog "To configure MediaTomb edit:" + elog "/etc/mediatomb/config.xml" + elog + elog "The MediaTomb web interface can be reached at (after the service is started):" + elog "http://localhost:49152/" +} -- cgit v1.2.3-65-gdbad