Date: Thu, 30 Jun 2011 03:10:05 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/158485: Update port: multimedia/gmerlin to 1.0.0 Message-ID: <20110630031005.6f76ce21.tkato432@yahoo.com> Resent-Message-ID: <201106291830.p5TIUJZJ009664@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158485
>Category: ports
>Synopsis: Update port: multimedia/gmerlin to 1.0.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 29 18:30:18 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 1.0.0
New file:
files/patch-configure
Remove file:
files/patch-plugins-png-ir_png.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/multimedia/gmerlin/Makefile multimedia/gmerlin/Makefile
--- /usr/ports/multimedia/gmerlin/Makefile 2011-06-11 16:15:47.000000000 +0900
+++ multimedia/gmerlin/Makefile 2011-06-29 01:40:22.000000000 +0900
@@ -6,8 +6,7 @@
#
PORTNAME= gmerlin
-PORTVERSION= 0.4.1
-PORTREVISION= 7
+PORTVERSION= 1.0.0
CATEGORIES= multimedia
MASTER_SITES= SF
@@ -16,28 +15,10 @@
LIB_DEPENDS= gavl.1:${PORTSDIR}/multimedia/gavl
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --without-doxygen --without-texinfo --disable-alsa \
- --disable-v4l --disable-alsamixer --disable-camelot \
- --without-cpuflags --disable-v4l2 --disable-v4lconvert
-USE_GNOME= gtk20 gnomehack libxml2
-USE_GL= gl
-USE_XORG= x11 xv xinerama ice
-USE_GETTEXT= yes
-USE_LDCONFIG= yes
-
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include/libvisual-0.4 -I${LOCALBASE}/include"
-
-PORTDOCS= README
-
-INFO= gmerlin
-MAN1= gmerlin_play.1
-
OPTIONS= PULSEAUDIO "Enable PulseAudio support" on \
QUICKTIME "Enable QuickTime support" on \
- LIBVISUAL "Enable libvisual support" on \
- LIBCDIO "Enable libcdio support" on \
+ VISUAL "Enable libvisual support" on \
+ CDIO "Enable libcdio support" on \
MUSICBRAINZ "Enable MusicBrainz support" on \
CDDB "Enable CDDB support" on \
ESOUND "Enable ESounD support" off \
@@ -45,15 +26,33 @@
JPEG "Enable JPEG support" on \
PNG "Enable PNG support" on \
TIFF "Enable TIFF support" on \
- MJPEGTOOLS "Enable mjpegtools support" on \
PLUGINCFG "Build plugin configurator" on \
PLAYER "Build player" on \
KBD "Build keyboard daemon" on \
TRANSCODER "Build transcoder" on \
+ RECORDER "Build recorder" on \
VISUALIZER "Build visualizer" on \
THUMBNAILER "Build thumbnailer" on \
OPTIMIZED_CFLAGS "Additional optimizations" on
+USE_GNOME= gnomehack gtk20 libxml2
+USE_XORG= ice x11 xinerama xv
+USE_GL= gl
+USE_GETTEXT= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS= --disable-alsa --disable-v4l --disable-v4l2 \
+ --disable-camelot --disable-alsamixer --disable-v4lconvert \
+ --without-doxygen --without-cpuflags
+USE_LDCONFIG= yes
+INSTALL_ICONS= yes
+
+CPPFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib
+
+INFO= gmerlin
+MAN1= gmerlin_play.1
+
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_PULSEAUDIO)
@@ -72,13 +71,13 @@
PLIST_SUB+= QUICKTIME="@comment "
.endif
-.if !defined(WITHOUT_LIBVISUAL)
+.if !defined(WITHOUT_VISUAL)
LIB_DEPENDS+= visual-0.4:${PORTSDIR}/graphics/libvisual04
.else
CONFIGURE_ARGS+=--disable-libvisual
.endif
-.if !defined(WITHOUT_LIBCDIO)
+.if !defined(WITHOUT_CDIO)
LIB_DEPENDS+= cdio.12:${PORTSDIR}/sysutils/libcdio
PLIST_SUB+= CDIO=""
.else
@@ -138,12 +137,6 @@
PLIST_SUB+= TIFF="@comment "
.endif
-.if !defined(WITHOUT_MJPEGTOOLS)
-LIB_DEPENDS+= lavjpeg-2.0.0:${PORTSDIR}/multimedia/mjpegtools
-.else
-CONFIGURE_ARGS+=--disable-mjpegtools
-.endif
-
# applications
.if !defined(WITHOUT_PLUGINCFG)
PLIST_SUB+= PLUGINCFG=""
@@ -175,6 +168,13 @@
PLIST_SUB+= TRANSCODER="@comment "
.endif
+.if !defined(WITHOUT_RECORDER)
+PLIST_SUB+= RECORDER=""
+.else
+CONFIGURE_ARGS+=--disable-recorder
+PLIST_SUB+= RECORDER="@comment "
+.endif
+
.if !defined(WITHOUT_VISUALIZER)
PLIST_SUB+= VISUALIZER=""
.else
@@ -196,22 +196,27 @@
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|-O3.*-ffast-math||g; \
- s|-DGTK_DISABLE_DEPRECATED||; \
- /LIBS/ s|-ldl||g; s|^LDFLAGS="|&$${LDFLAGS} |' \
- ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|-ldl||; s|-lpthread|${PTHREAD_LIBS}|; \
- /^LIBS = / s|$$| @LIBINTL@ ${PTHREAD_LIBS}|' \
- ${WRKSRC}/lib/Makefile.in ${WRKSRC}/tests/Makefile.in \
- ${WRKSRC}/apps/cmdlineplayer/Makefile.in \
- ${WRKSRC}/apps/kbd/Makefile.in \
- ${WRKSRC}/apps/player/Makefile.in \
- ${WRKSRC}/apps/transcoder/Makefile.in \
- ${WRKSRC}/apps/thumbnailer/Makefile.in
+ @${REINPLACE_CMD} -e \
+ 's|-O3.*-ffast-math||g ; \
+ s|-DGTK_DISABLE_DEPRECATED||g ; \
+ /LIBS/ s|-ldl||g ; \
+ s|^LDFLAGS="|&$${LDFLAGS} |g' ${WRKSRC}/configure
+.for file in apps/cmdlineplayer/Makefile.in apps/kbd/Makefile.in \
+ apps/player/Makefile.in apps/transcoder/Makefile.in \
+ apps/thumbnailer/Makefile.in lib/Makefile.in tests/Makefile.in
+ @${REINPLACE_CMD} -e \
+ 's|-ldl||g ; \
+ s|-lpthread|${PTHREAD_LIBS}|g ; \
+ /^LIBS = / s|$$| @LIBINTL@ ${PTHREAD_LIBS}|g' ${WRKSRC}/${file}
+.endfor
+.for file in doc/Makefile.in
+ @${REINPLACE_CMD} -e \
+ 's|^texinfo_|#texinfo_|g' ${WRKSRC}/${file}
+.endfor
-.if !defined(NOPORTDOCS)
post-install:
- ${MKDIR} ${DOCSDIR}
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif
diff -urN /usr/ports/multimedia/gmerlin/distinfo multimedia/gmerlin/distinfo
--- /usr/ports/multimedia/gmerlin/distinfo 2009-08-12 16:04:48.000000000 +0900
+++ multimedia/gmerlin/distinfo 2011-06-26 12:59:00.000000000 +0900
@@ -1,3 +1,2 @@
-MD5 (gmerlin-0.4.1.tar.gz) = 34af7c8d374d5bc9be24a12a27cb2ed8
-SHA256 (gmerlin-0.4.1.tar.gz) = 938f1852809c2d0010384186eb887b7f5f380e372441d16b4987bfb1baedf81b
-SIZE (gmerlin-0.4.1.tar.gz) = 2353618
+SHA256 (gmerlin-1.0.0.tar.gz) = a94bfd08869aa575982f4713a103bb0af314591414c02be6634239b70d7a9b14
+SIZE (gmerlin-1.0.0.tar.gz) = 2450041
diff -urN /usr/ports/multimedia/gmerlin/files/patch-configure multimedia/gmerlin/files/patch-configure
--- /usr/ports/multimedia/gmerlin/files/patch-configure 1970-01-01 09:00:00.000000000 +0900
+++ multimedia/gmerlin/files/patch-configure 2011-06-29 01:06:53.000000000 +0900
@@ -0,0 +1,23 @@
+--- configure.orig 2011-01-08 09:50:08.000000000 +0900
++++ configure 2011-06-29 01:06:34.000000000 +0900
+@@ -1042,6 +1042,7 @@
+ with_x
+ enable_pulseaudio
+ enable_lqt
++enable_v4lconvert
+ enable_libvisual
+ enable_libcdio
+ enable_musicbrainz
+@@ -15115,9 +15116,9 @@
+ V4LCONVERT_REQUIRED="0.5.7"
+ have_v4lconvert=false
+
+-# Check whether --enable-lqt was given.
+-if test "${enable_lqt+set}" = set; then :
+- enableval=$enable_lqt; case "${enableval}" in
++# Check whether --enable-v4lconvert was given.
++if test "${enable_v4lconvert+set}" = set; then :
++ enableval=$enable_v4lconvert; case "${enableval}" in
+ yes) test_v4lconvert=true ;;
+ no) test_v4lconvert=false ;;
+ esac
diff -urN /usr/ports/multimedia/gmerlin/files/patch-plugins-png-ir_png.c multimedia/gmerlin/files/patch-plugins-png-ir_png.c
--- /usr/ports/multimedia/gmerlin/files/patch-plugins-png-ir_png.c 2010-06-22 07:06:33.000000000 +0900
+++ multimedia/gmerlin/files/patch-plugins-png-ir_png.c 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- ./plugins/png/ir_png.c.orig 2009-06-11 19:25:29.000000000 +0400
-+++ ./plugins/png/ir_png.c 2010-05-31 19:38:31.000000000 +0400
-@@ -126,7 +126,7 @@
- bits = 16;
- }
- if(bit_depth < 8)
-- png_set_gray_1_2_4_to_8(png->png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png->png_ptr);
- if (png_get_valid(png->png_ptr, png->info_ptr, PNG_INFO_tRNS))
- {
- png_set_tRNS_to_alpha(png->png_ptr);
diff -urN /usr/ports/multimedia/gmerlin/pkg-plist multimedia/gmerlin/pkg-plist
--- /usr/ports/multimedia/gmerlin/pkg-plist 2009-08-12 16:04:48.000000000 +0900
+++ multimedia/gmerlin/pkg-plist 2011-06-29 01:12:59.000000000 +0900
@@ -8,11 +8,14 @@
bin/gmerlin_play
%%PLUGINCFG%%bin/gmerlin_plugincfg
bin/gmerlin_psnr
+%%RECORDER%%bin/gmerlin_recorder
%%PLAYER%%bin/gmerlin_remote
+bin/gmerlin_ssim
%%TRANSCODER%%bin/gmerlin_transcoder
%%TRANSCODER%%bin/gmerlin_transcoder_remote
-%%VISUALIZER%%bin/gmerlin_visualizer
+bin/gmerlin_vanalyze
bin/gmerlin_visualize
+%%VISUALIZER%%bin/gmerlin_visualizer
bin/gmerlin_visualizer_slave
bin/gmerlin_vpsnr
include/gmerlin/accelerator.h
@@ -26,8 +29,7 @@
include/gmerlin/cmdline.h
include/gmerlin/converters.h
include/gmerlin/edl.h
-include/gmerlin/encoderinfo.h
-include/gmerlin/fifo.h
+include/gmerlin/encoder.h
include/gmerlin/fileformat.h
include/gmerlin/filters.h
include/gmerlin/gui_gtk/aboutwindow.h
@@ -46,6 +48,7 @@
include/gmerlin/gui_gtk/message.h
include/gmerlin/gui_gtk/multiinfo.h
include/gmerlin/gui_gtk/plugin.h
+include/gmerlin/gui_gtk/presetmenu.h
include/gmerlin/gui_gtk/question.h
include/gmerlin/gui_gtk/scrolltext.h
include/gmerlin/gui_gtk/slider.h
@@ -62,7 +65,10 @@
include/gmerlin/player.h
include/gmerlin/playermsg.h
include/gmerlin/plugin.h
+include/gmerlin/pluginfuncs.h
include/gmerlin/pluginregistry.h
+include/gmerlin/preset.h
+include/gmerlin/recorder.h
include/gmerlin/remote.h
include/gmerlin/serialize.h
include/gmerlin/singlepic.h
@@ -94,6 +100,8 @@
lib/gmerlin/plugins/fa_sampleformat.so
lib/gmerlin/plugins/fa_volume.la
lib/gmerlin/plugins/fa_volume.so
+lib/gmerlin/plugins/fv_bitshift.la
+lib/gmerlin/plugins/fv_bitshift.so
lib/gmerlin/plugins/fv_blur.la
lib/gmerlin/plugins/fv_blur.so
lib/gmerlin/plugins/fv_colorbalance.la
@@ -112,6 +120,8 @@
lib/gmerlin/plugins/fv_equalizer.so
lib/gmerlin/plugins/fv_flip.la
lib/gmerlin/plugins/fv_flip.so
+lib/gmerlin/plugins/fv_framerate.la
+lib/gmerlin/plugins/fv_framerate.so
lib/gmerlin/plugins/fv_interlace.la
lib/gmerlin/plugins/fv_interlace.so
lib/gmerlin/plugins/fv_invert_rgb.la
@@ -120,12 +130,12 @@
lib/gmerlin/plugins/fv_oldcolor.so
lib/gmerlin/plugins/fv_pixelformat.la
lib/gmerlin/plugins/fv_pixelformat.so
-lib/gmerlin/plugins/fv_tlp.la
-lib/gmerlin/plugins/fv_tlp.so
lib/gmerlin/plugins/fv_tcdisplay.la
lib/gmerlin/plugins/fv_tcdisplay.so
lib/gmerlin/plugins/fv_tctweak.la
lib/gmerlin/plugins/fv_tctweak.so
+lib/gmerlin/plugins/fv_tlp.la
+lib/gmerlin/plugins/fv_tlp.so
lib/gmerlin/plugins/fv_transform.la
lib/gmerlin/plugins/fv_transform.so
lib/gmerlin/plugins/fv_zoom.la
@@ -146,6 +156,8 @@
lib/gmerlin/plugins/i_oss.so
%%PULSEAUDIO%%lib/gmerlin/plugins/i_pulse.la
%%PULSEAUDIO%%lib/gmerlin/plugins/i_pulse.so
+lib/gmerlin/plugins/i_x11.la
+lib/gmerlin/plugins/i_x11.so
lib/gmerlin/plugins/ir_bmp.la
lib/gmerlin/plugins/ir_bmp.so
lib/gmerlin/plugins/ir_gavl.la
@@ -197,8 +209,10 @@
%%KBD%%share/applications/gmerlin-kbd.desktop
%%PLAYER%%share/applications/gmerlin-player.desktop
%%PLUGINCFG%%share/applications/gmerlin-plugincfg.desktop
+%%RECORDER%%share/applications/gmerlin-recorder.desktop
%%TRANSCODER%%share/applications/gmerlin-transcoder.desktop
%%VISUALIZER%%share/applications/gmerlin-visualizer.desktop
+%%PORTDOCS%%%%DOCSDIR%%/README
%%DATADIR%%/icons/about_16.png
%%DATADIR%%/icons/add_16.png
%%DATADIR%%/icons/audio_16.png
@@ -263,6 +277,7 @@
%%DATADIR%%/icons/plugincfg_icon.png
%%DATADIR%%/icons/quit_16.png
%%DATADIR%%/icons/record_16.png
+%%DATADIR%%/icons/recorder_icon.png
%%DATADIR%%/icons/refresh_16.png
%%DATADIR%%/icons/rename_16.png
%%DATADIR%%/icons/repeat_mode_1.png
@@ -271,6 +286,7 @@
%%DATADIR%%/icons/right_16.png
%%DATADIR%%/icons/run_16.png
%%DATADIR%%/icons/save_16.png
+%%DATADIR%%/icons/snapshot_16.png
%%DATADIR%%/icons/sort_16.png
%%DATADIR%%/icons/state_buffering_1.png
%%DATADIR%%/icons/state_buffering_2.png
@@ -334,12 +350,21 @@
%%DATADIR%%/skins/Default/volume_slider_cl.png
%%DATADIR%%/skins/Default/volume_slider_hl.png
%%DATADIR%%/skins/Default/volume_slider_in.png
+share/icons/hicolor/48x48/apps/gmerlin-alsamixer.png
+share/icons/hicolor/48x48/apps/gmerlin-camelot.png
+share/icons/hicolor/48x48/apps/gmerlin-kbd.png
+share/icons/hicolor/48x48/apps/gmerlin-player.png
+share/icons/hicolor/48x48/apps/gmerlin-plugincfg.png
+share/icons/hicolor/48x48/apps/gmerlin-recorder.png
+share/icons/hicolor/48x48/apps/gmerlin-transcoder.png
+share/icons/hicolor/48x48/apps/gmerlin-visualizer.png
share/locale/de/LC_MESSAGES/gmerlin.mo
@dirrm %%DATADIR%%/skins/Default
@dirrm %%DATADIR%%/skins
@dirrm %%DATADIR%%/osd
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry share/applications
@dirrm lib/gmerlin/plugins
@dirrm lib/gmerlin
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110630031005.6f76ce21.tkato432>