From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 30 05:20:05 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 044CE106567A for ; Sun, 30 May 2010 05:20:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (unknown [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D45888FC15 for ; Sun, 30 May 2010 05:20:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o4U5K48p031280 for ; Sun, 30 May 2010 05:20:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o4U5K40T031279; Sun, 30 May 2010 05:20:04 GMT (envelope-from gnats) Resent-Date: Sun, 30 May 2010 05:20:04 GMT Resent-Message-Id: <201005300520.o4U5K40T031279@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Carey Jones Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 554E6106564A for ; Sun, 30 May 2010 05:17:38 +0000 (UTC) (envelope-from mcj@bluetonic.org) Received: from ark.bluetonic.org (c-68-46-205-228.hsd1.ks.comcast.net [68.46.205.228]) by mx1.freebsd.org (Postfix) with ESMTP id 2A84F8FC13 for ; Sun, 30 May 2010 05:17:37 +0000 (UTC) Received: from ark.bluetonic.org (localhost [127.0.0.1]) by ark.bluetonic.org (8.14.4/8.14.4) with ESMTP id o4U5Hauf009688 for ; Sun, 30 May 2010 00:17:36 -0500 (CDT) (envelope-from mcj@ark.bluetonic.org) Received: (from mcj@localhost) by ark.bluetonic.org (8.14.4/8.14.4/Submit) id o4U5HaNQ009687; Sun, 30 May 2010 00:17:36 -0500 (CDT) (envelope-from mcj) Message-Id: <201005300517.o4U5HaNQ009687@ark.bluetonic.org> Date: Sun, 30 May 2010 00:17:36 -0500 (CDT) From: Carey Jones To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/147201: Update to the net/mediatomb port X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Carey Jones List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2010 05:20:05 -0000 >Number: 147201 >Category: ports >Synopsis: Update to the net/mediatomb port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun May 30 05:20:04 UTC 2010 >Closed-Date: >Last-Modified: >Originator: M. Carey Jones >Release: FreeBSD 8.1-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD ark.bluetonic.org 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0: Wed May 19 00:23:09 CDT 2010 root@ark.bluetonc.org:/usr/obj/usr/src/sys/ARK amd64 >Description: Upgrade the Mediatomb version to 0.12.1, fix configure args to match the newer version, and add an optional dependency for ffmpegthumbnailer. I've e-mailed the port maintainer directly 4 days ago, but received no response. >How-To-Repeat: N/A >Fix: diff -ruN net/mediatomb.orig/Makefile net/mediatomb/Makefile --- net/mediatomb.orig/Makefile 2010-05-26 20:38:35.865809312 -0500 +++ net/mediatomb/Makefile 2010-05-26 21:12:53.899143274 -0500 @@ -6,8 +6,7 @@ # PORTNAME= mediatomb -PORTVERSION= 0.11.0 -PORTREVISION= 4 +PORTVERSION= 0.12.1 CATEGORIES= net multimedia MASTER_SITES= SF/${PORTNAME}/MediaTomb/${PORTVERSION} @@ -54,6 +53,7 @@ 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 +95,8 @@ .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 +108,16 @@ 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 @@ .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 -ruN net/mediatomb.orig/distinfo net/mediatomb/distinfo --- net/mediatomb.orig/distinfo 2010-05-26 20:38:35.865809312 -0500 +++ net/mediatomb/distinfo 2010-05-26 20:48:52.433531678 -0500 @@ -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 -ruN net/mediatomb.orig/files/patch-src-url.cc net/mediatomb/files/patch-src-url.cc --- net/mediatomb.orig/files/patch-src-url.cc 2010-05-26 20:38:35.864808624 -0500 +++ net/mediatomb/files/patch-src-url.cc 1969-12-31 18:00:00.000000000 -0600 @@ -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()); >Release-Note: >Audit-Trail: >Unformatted: