3 files changed, 19 insertions, 22 deletions

diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index 338e6b265640..2a25d864d275 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	mediatomb
-PORTVERSION=	0.11.0
-PORTREVISION=	4
+PORTVERSION=	0.12.1
 CATEGORIES=	net multimedia
 MASTER_SITES=	SF/${PORTNAME}/MediaTomb/${PORTVERSION}
 
 MAINTAINER=	leo@mediatomb.cc
 COMMENT=	UPnP AV MediaServer
 
+LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
+
 MAN1=		mediatomb.1
 GNU_CONFIGURE=	yes
 LDFLAGS+=	${PTHREAD_LIBS}
@@ -24,7 +25,6 @@ CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		CFLAGS="${CFLAGS}"
-LIB_DEPENDS+=	expat:${PORTSDIR}/textproc/expat2
 USE_RC_SUBR=	mediatomb.sh
 
 # --- configurable variables ---
@@ -54,6 +54,7 @@ OPTIONS=	SQLITE3 "sqlite3 support" on \
 		LIBEXIF "libexif support" on \
 		TAGLIB "taglib support" on \
 		FFMPEG "ffmpeg metadata extraction support" on \
+		FFMPEGTHUMBNAILER "ffmpeg thumbnailer support" on \
 		EXTERNAL_TRANSCODING "external transcoding support" on \
 		CURL "curl support" on \
 		ID3LIB "id3lib support" off \
@@ -95,8 +96,8 @@ CONFIGURE_ARGS+=	--disable-libjs
 
 .if defined(WITH_LIBEXIF)
 CONFIGURE_ARGS+=	--enable-libexif \
-			--with-exif-h="${LOCALBASE}/include" \
-			--with-exif-libs="${LOCALBASE}/lib"
+			--with-libexif-h="${LOCALBASE}/include" \
+			--with-libexif-libs="${LOCALBASE}/lib"
 LIB_DEPENDS+=		exif:${PORTSDIR}/graphics/libexif
 .else
 CONFIGURE_ARGS+=	--disable-libexif
@@ -108,6 +109,15 @@ CONFIGURE_ARGS+=	--enable-external-transcoding
 CONFIGURE_ARGS+=	--disable-external-transcoding
 .endif
 
+.if defined(WITH_FFMPEGTHUMBNAILER)
+CONFIGURE_ARGS+=	--enable-ffmpegthumbnailer \
+			--with-ffmpegthumbnailer-h="${LOCALBASE}/include" \
+			--with-ffmpegthumbnailer-libs="${LOCALBASE}/lib"
+LIB_DEPENDS+=		ffmpegthumbnailer:${PORTSDIR}/multimedia/ffmpegthumbnailer
+.else
+CONFIGURE_ARGS+=	--disable-ffmpegthumbnailer
+.endif
+
 # CURL is only useful in combination with EXTERNAL_TRANSCODING
 .if defined(WITH_CURL) && defined(WITH_EXTERNAL_TRANSCODING)
 CONFIGURE_ARGS+=	--enable-curl \
@@ -122,9 +132,7 @@ IGNORE=	cannot be compiled with both, ffmpeg and libextractor. Please (re)run 'm
 .endif
 
 .if defined(WITH_FFMPEG)
-CONFIGURE_ARGS+=	--enable-ffmpeg \
-			--with-ffmpeg-h="${LOCALBASE}/include" \
-			--with-ffmpeg-libs="${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	--enable-ffmpeg
 LIB_DEPENDS+=		avformat:${PORTSDIR}/multimedia/ffmpeg
 .else
 CONFIGURE_ARGS+=	--disable-ffmpeg
diff --git a/net/mediatomb/distinfo b/net/mediatomb/distinfo
index 056c6212690d..7e5f1f3caa2f 100644
--- a/net/mediatomb/distinfo
+++ b/net/mediatomb/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediatomb-0.11.0.tar.gz) = 661f08933830d920de21436fe122fb15
-SHA256 (mediatomb-0.11.0.tar.gz) = 25e0b3d761e41fc6793c780eb7f638719867cdc6d3429ec24f72d1e9556ac1d2
-SIZE (mediatomb-0.11.0.tar.gz) = 1059429
+MD5 (mediatomb-0.12.1.tar.gz) = e927dd5dc52d3cfcebd8ca1af6f0d3c2
+SHA256 (mediatomb-0.12.1.tar.gz) = 31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd
+SIZE (mediatomb-0.12.1.tar.gz) = 1240612
diff --git a/net/mediatomb/files/patch-src-url.cc b/net/mediatomb/files/patch-src-url.cc
deleted file mode 100644
index cf3ecfa36270..000000000000
--- a/net/mediatomb/files/patch-src-url.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/url.cc.old	2009-01-24 15:50:40.000000000 +0200
-+++ src/url.cc	2009-01-24 15:51:07.000000000 +0200
-@@ -75,7 +75,7 @@
- 
-     if (only_header)
-     {
--        curl_easy_setopt(curl_handle, CURLOPT_NOBODY);
-+        curl_easy_setopt(curl_handle, CURLOPT_NOBODY, 1);
-         curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl);
-         curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, 
-                          (void *)buffer.getPtr());