3 files changed, 50 insertions, 9 deletions

diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile
index 4db4a5d225ae..495617eca848 100644
--- a/multimedia/gmerlin/Makefile
+++ b/multimedia/gmerlin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmerlin
-PORTVERSION=	0.3.8
-PORTREVISION=	2
+PORTVERSION=	0.4.1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
@@ -19,7 +18,7 @@ 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
+		--without-cpuflags --disable-v4l2 --disable-v4lconvert
 USE_GNOME=	gtk20 gnomehack libxml2
 USE_GL=		gl
 USE_XORG=	x11 xv xinerama ice
@@ -40,6 +39,7 @@ OPTIONS=	PULSEAUDIO "Enable PulseAudio support" on \
 		MUSICBRAINZ "Enable MusicBrainz support" on \
 		CDDB	"Enable CDDB support" on \
 		ESOUND	"Enable ESounD support" off \
+		JACK	"Enable Jack support" on \
 		JPEG	"Enable JPEG support" on \
 		PNG	"Enable PNG support" on \
 		TIFF	"Enable TIFF support" on \
@@ -49,6 +49,7 @@ OPTIONS=	PULSEAUDIO "Enable PulseAudio support" on \
 		KBD	"Build keyboard daemon" on \
 		TRANSCODER "Build transcoder" on \
 		VISUALIZER "Build visualizer" on \
+		THUMBNAILER "Build thumbnailer" on \
 		OPTIMIZED_CFLAGS "Additional optimizations" on
 
 .include <bsd.port.pre.mk>
@@ -103,6 +104,14 @@ CONFIGURE_ARGS+=--disable-esd
 PLIST_SUB+=	ESOUND="@comment "
 .endif
 
+.if defined(WITH_JACK)
+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+PLIST_SUB+=	JACK=""
+.else
+CONFIGURE_ARGS+=--disable-jack
+PLIST_SUB+=	JACK="@comment "
+.endif
+
 .if !defined(WITHOUT_JPEG)
 LIB_DEPENDS+=	jpeg.10:${PORTSDIR}/graphics/jpeg
 PLIST_SUB+=	JPEG=""
@@ -171,6 +180,13 @@ CONFIGURE_ARGS+=--disable-visualizer
 PLIST_SUB+=	VISUALIZER="@comment "
 .endif
 
+.if !defined(WITHOUT_THUMBNAILER)
+PLIST_SUB+=	THUMBNAILER=""
+.else
+CONFIGURE_ARGS+=--disable-thumbnailer
+PLIST_SUB+=	THUMBNAILER="@comment "
+.endif
+
 # vendor ocflags from configure
 .if !defined(WITHOUT_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math
@@ -187,7 +203,8 @@ post-patch:
 		${WRKSRC}/apps/cmdlineplayer/Makefile.in \
 		${WRKSRC}/apps/kbd/Makefile.in \
 		${WRKSRC}/apps/player/Makefile.in \
-		${WRKSRC}/apps/transcoder/Makefile.in
+		${WRKSRC}/apps/transcoder/Makefile.in \
+		${WRKSRC}/apps/thumbnailer/Makefile.in
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/multimedia/gmerlin/distinfo b/multimedia/gmerlin/distinfo
index eb9c5f0bb301..458b1d8621c2 100644
--- a/multimedia/gmerlin/distinfo
+++ b/multimedia/gmerlin/distinfo
@@ -1,3 +1,3 @@
-MD5 (gmerlin-0.3.8.tar.gz) = e9339c042116587861033dcb75409d49
-SHA256 (gmerlin-0.3.8.tar.gz) = c6ca9bfc848b64f107ba79e19138d1574e63d8bd00f426d430abda3188886fa2
-SIZE (gmerlin-0.3.8.tar.gz) = 2259185
+MD5 (gmerlin-0.4.1.tar.gz) = 34af7c8d374d5bc9be24a12a27cb2ed8
+SHA256 (gmerlin-0.4.1.tar.gz) = 938f1852809c2d0010384186eb887b7f5f380e372441d16b4987bfb1baedf81b
+SIZE (gmerlin-0.4.1.tar.gz) = 2353618
diff --git a/multimedia/gmerlin/pkg-plist b/multimedia/gmerlin/pkg-plist
index 634b44a0dd22..3252c09dcc81 100644
--- a/multimedia/gmerlin/pkg-plist
+++ b/multimedia/gmerlin/pkg-plist
@@ -1,30 +1,35 @@
 %%PLAYER%%bin/gmerlin
+%%THUMBNAILER%%bin/gmerlin-video-thumbnailer
 bin/gmerlin_imgconvert
+bin/gmerlin_imgdiff
 %%KBD%%bin/gmerlin_kbd
 %%KBD%%bin/gmerlin_kbd_config
 %%PLAYER%%bin/gmerlin_launcher
 bin/gmerlin_play
 %%PLUGINCFG%%bin/gmerlin_plugincfg
+bin/gmerlin_psnr
 %%PLAYER%%bin/gmerlin_remote
 %%TRANSCODER%%bin/gmerlin_transcoder
 %%TRANSCODER%%bin/gmerlin_transcoder_remote
 %%VISUALIZER%%bin/gmerlin_visualizer
+bin/gmerlin_visualize
 bin/gmerlin_visualizer_slave
+bin/gmerlin_vpsnr
 include/gmerlin/accelerator.h
 include/gmerlin/bg_sem.h
 include/gmerlin/bg_version.h
+include/gmerlin/bggavl.h
 include/gmerlin/bgsocket.h
 include/gmerlin/cfg_dialog.h
 include/gmerlin/cfg_registry.h
 include/gmerlin/charset.h
 include/gmerlin/cmdline.h
-include/gmerlin/config.h
 include/gmerlin/converters.h
 include/gmerlin/edl.h
 include/gmerlin/encoderinfo.h
 include/gmerlin/fifo.h
+include/gmerlin/fileformat.h
 include/gmerlin/filters.h
-include/gmerlin/float_cast.h
 include/gmerlin/gui_gtk/aboutwindow.h
 include/gmerlin/gui_gtk/albumentry.h
 include/gmerlin/gui_gtk/audio.h
@@ -59,6 +64,7 @@ include/gmerlin/playermsg.h
 include/gmerlin/plugin.h
 include/gmerlin/pluginregistry.h
 include/gmerlin/remote.h
+include/gmerlin/serialize.h
 include/gmerlin/singlepic.h
 include/gmerlin/streaminfo.h
 include/gmerlin/subprocess.h
@@ -71,6 +77,7 @@ include/gmerlin/tree.h
 include/gmerlin/utils.h
 include/gmerlin/visualize.h
 include/gmerlin/x11/x11.h
+include/gmerlin/xmlutils.h
 %%QUICKTIME%%lib/gmerlin/plugins/e_lqt.la
 %%QUICKTIME%%lib/gmerlin/plugins/e_lqt.so
 lib/gmerlin/plugins/e_pp_cdrdao.la
@@ -105,6 +112,8 @@ lib/gmerlin/plugins/fv_equalizer.la
 lib/gmerlin/plugins/fv_equalizer.so
 lib/gmerlin/plugins/fv_flip.la
 lib/gmerlin/plugins/fv_flip.so
+lib/gmerlin/plugins/fv_interlace.la
+lib/gmerlin/plugins/fv_interlace.so
 lib/gmerlin/plugins/fv_invert_rgb.la
 lib/gmerlin/plugins/fv_invert_rgb.so
 lib/gmerlin/plugins/fv_oldcolor.la
@@ -113,6 +122,12 @@ 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_transform.la
+lib/gmerlin/plugins/fv_transform.so
 lib/gmerlin/plugins/fv_zoom.la
 lib/gmerlin/plugins/fv_zoom.so
 %%CDIO%%lib/gmerlin/plugins/i_cdaudio.la
@@ -121,6 +136,8 @@ lib/gmerlin/plugins/i_edl.la
 lib/gmerlin/plugins/i_edl.so
 %%ESOUND%%lib/gmerlin/plugins/i_esd.la
 %%ESOUND%%lib/gmerlin/plugins/i_esd.so
+%%JACK%%lib/gmerlin/plugins/i_jack.la
+%%JACK%%lib/gmerlin/plugins/i_jack.so
 %%QUICKTIME%%lib/gmerlin/plugins/i_lqt.la
 %%QUICKTIME%%lib/gmerlin/plugins/i_lqt.so
 lib/gmerlin/plugins/i_mikmod.la
@@ -131,6 +148,8 @@ lib/gmerlin/plugins/i_oss.so
 %%PULSEAUDIO%%lib/gmerlin/plugins/i_pulse.so
 lib/gmerlin/plugins/ir_bmp.la
 lib/gmerlin/plugins/ir_bmp.so
+lib/gmerlin/plugins/ir_gavl.la
+lib/gmerlin/plugins/ir_gavl.so
 %%JPEG%%lib/gmerlin/plugins/ir_jpeg.la
 %%JPEG%%lib/gmerlin/plugins/ir_jpeg.so
 %%PNG%%lib/gmerlin/plugins/ir_png.la
@@ -143,6 +162,8 @@ lib/gmerlin/plugins/ir_tga.so
 %%TIFF%%lib/gmerlin/plugins/ir_tiff.so
 lib/gmerlin/plugins/iw_bmp.la
 lib/gmerlin/plugins/iw_bmp.so
+lib/gmerlin/plugins/iw_gavl.la
+lib/gmerlin/plugins/iw_gavl.so
 %%JPEG%%lib/gmerlin/plugins/iw_jpeg.la
 %%JPEG%%lib/gmerlin/plugins/iw_jpeg.so
 %%PNG%%lib/gmerlin/plugins/iw_png.la
@@ -155,6 +176,8 @@ lib/gmerlin/plugins/iw_tga.so
 %%TIFF%%lib/gmerlin/plugins/iw_tiff.so
 %%ESOUND%%lib/gmerlin/plugins/oa_esd.la
 %%ESOUND%%lib/gmerlin/plugins/oa_esd.so
+%%JACK%%lib/gmerlin/plugins/oa_jack.la
+%%JACK%%lib/gmerlin/plugins/oa_jack.so
 lib/gmerlin/plugins/oa_oss.la
 lib/gmerlin/plugins/oa_oss.so
 %%PULSEAUDIO%%lib/gmerlin/plugins/oa_pulse.la
@@ -197,6 +220,7 @@ libdata/pkgconfig/gmerlin.pc
 %%DATADIR%%/icons/digit_8.png
 %%DATADIR%%/icons/digit_9.png
 %%DATADIR%%/icons/digit_colon.png
+%%DATADIR%%/icons/digit_dot.png
 %%DATADIR%%/icons/digit_minus.png
 %%DATADIR%%/icons/display_mode_all.png
 %%DATADIR%%/icons/display_mode_all_rem.png