Date: Fri, 26 Oct 2012 08:10:35 GMT From: RyoTa SimaMoto <liangtai.s4@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/173112: [update] multimedia/qmmp support 4 ports of ffmpeg Message-ID: <201210260810.q9Q8AZoO038131@red.freebsd.org> Resent-Message-ID: <201210260820.q9Q8K0id078096@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173112
>Category: ports
>Synopsis: [update] multimedia/qmmp support 4 ports of ffmpeg
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Oct 26 08:20:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: RyoTa SimaMoto
>Release: 9-STABLE
>Organization:
>Environment:
FreeBSD takiba.fakenet 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r240880: Tue Sep 25 17:08:36 JST 2012 root@takiba.fakenet:/usr/obj/usr/src/sys/VAIO i386
>Description:
Update Makefile options to let users select ffmpeg version
among multimedia/ffmpeg, multimedia/ffmpeg-011,
multimedia/ffmpeg1, and multimedia/ffmpeg-devel.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: multimedia/qmmp/Makefile
===================================================================
--- multimedia/qmmp/Makefile (revision 306289)
+++ multimedia/qmmp/Makefile (working copy)
@@ -23,14 +23,16 @@
USE_LDCONFIG= yes
USE_PKGCONFIG= build
+OPTIONS_SINGLE= FFMPEG
+OPTIONS_SINGLE_FFMPEG= FFMPEG0_7 FFMPEG0_11 FFMPEG1_0 FFMPEGDEVEL
OPTIONS_DEFINE= SKINNEDUI DIR_ASSOC APIDOC PULSEAUDIO ALSA OSS OSS4 \
JACK NULLOUT FLAC MUSEPACK FFMPEG MODPLUG WILDMIDI GME MAD \
VORBIS SNDFILE WAVPACK CUE CDIO FAAD LADSPA CROSSFADE BS2B \
STEREO SRCONV MPLAYER CURL MMS PROJECTM ANALYZER ENCA \
CONVERTER MPRIS SCROBBLER STATICON SB NOTIFIER LYRICS HOTKEY \
FILEOPS COVER KDENOTIFY HAL UDISKS QMMP_DIALOG
-OPTIONS_DEFAULT= SKINNEDUI DIR_ASSOC PULSEAUDIO ALSA OSS4 \
- JACK NULLOUT FLAC MUSEPACK FFMPEG MODPLUG WILDMIDI GME MAD \
+OPTIONS_DEFAULT= SKINNEDUI DIR_ASSOC PULSEAUDIO ALSA OSS4 JACK \
+ NULLOUT FLAC MUSEPACK FFMPEG FFMPEG1_0 MODPLUG WILDMIDI GME MAD \
VORBIS SNDFILE WAVPACK CUE CDIO FAAD LADSPA CROSSFADE BS2B \
STEREO SRCONV MPLAYER CURL MMS PROJECTM ANALYZER ENCA \
CONVERTER MPRIS SCROBBLER STATICON SB NOTIFIER LYRICS HOTKEY \
@@ -42,7 +44,6 @@
NULLOUT_DESC= Support a null output
WILDMIDI_DESC= Support to playback MIDI files
GME_DESC= Support video game music files
-CDIO_DESC= Support to playback compact discs
CROSSFADE_DESC= Support cross-fade effect
BS2B_DESC= Support the Bauer stereophonic2binaural effect
STEREO_DESC= Support stereo effect
@@ -63,6 +64,10 @@
KDENOTIFY_DESC= Support to popup notifier for KDE
UDISKS_DESC= Support removable disc detection using UDisks
QMMP_DIALOG_DESC= An original dialog
+FFMPEG0_7_DESC= ffmpeg-0.7.x (multimedia/ffmpeg)
+FFMPEG0_11_DESC= ffmpeg-0.11.x (multimedia/ffmpeg-011)
+FFMPEG1_0_DESC= ffmpeg-1.0 (multimedia/ffmpeg1)
+FFMPEGDEVEL_DESC= ffmpeg-devel (multimedia/ffmpeg-devel)
.include <bsd.port.options.mk>
@@ -151,12 +156,24 @@
.endif
.if ${PORT_OPTIONS:MFFMPEG}
-PLIST_SUB+= FFMPEG=""
-. if exists(${LOCALBASE}/include/libavcodec/vda.h)
+. if ${PORT_OPTIONS:MFFMPEGDEVEL}
LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg-devel
+FFMPEG_SUFFIX= -devel
. else
+. if ${PORT_OPTIONS:MFFMPEG1_0}
+LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg1
+FFMPEG_SUFFIX= 1
+. else
+. if ${PORT_OPTIONS:MFFMPEG0_11}
+LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg-011
+FFMPEG_SUFFIX= -011
+. else
LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_SUFFIX=
+. endif
+. endif
. endif
+PLIST_SUB+= FFMPEG=""
PLUGIN_OPTIONS_CMAKE+= -DUSE_FFMPEG:BOOL=TRUE
.else
PLIST_SUB+= FFMPEG="@comment "
@@ -498,6 +515,11 @@
pre-configure:
${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
+ ${REINPLACE_CMD} -e '/pkg_check_modules/ { \
+ s|\(libavcodec\)[^ ]*>=|\1${FFMPEG_SUFFIX}>=|g; \
+ s|\(libavformat\)[^ ]*>=|\1${FFMPEG_SUFFIX}>=|g; \
+ s|\(libavutil\)[^ ]*>=|\1${FFMPEG_SUFFIX}>=|g; }' \
+ ${WRKSRC}/src/plugins/Input/ffmpeg/CMakeLists.txt
post-build:
.if ${PORT_OPTIONS:MAPIDOC}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210260810.q9Q8AZoO038131>