3 files changed, 28 insertions, 10 deletions

diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index 5745e504473e..84be7e47cab5 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmerlin-avdecoder
-PORTVERSION=	0.1.8
-PORTREVISION=	4
+PORTVERSION=	1.0.1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/gmerlin
 
@@ -44,6 +43,8 @@ OPTIONS=	GMERLIN	"Enable gmerlin support" on \
 		A52	"Enable A52 support" on \
 		DCA	"Enable DTS Coherent Acoustics decoder" on \
 		LIBCDIO	"Enable libcdio support" on \
+		OPENJPEG "Enable JPEG2000 support" on \
+		SCHROEDINGER "Enable dirac support" on \
 		OPTIMIZED_CFLAGS "Additional optimizations" on
 
 .include <bsd.port.pre.mk>
@@ -130,8 +131,10 @@ CONFIGURE_ARGS+=--disable-faad2
 
 .if !defined(WITHOUT_DVDREAD)
 LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
+PLIST_SUB+=	DVDREAD=""
 .else
 CONFIGURE_ARGS+=--disable-dvdread
+PLIST_SUB+=	DVDREAD="@comment "
 .endif
 
 .if !defined(WITHOUT_FLAC)
@@ -167,8 +170,22 @@ CONFIGURE_ARGS+=--disable-libcda --disable-libdca
 
 .if !defined(WITHOUT_LIBCDIO)
 LIB_DEPENDS+=	cdio.8:${PORTSDIR}/sysutils/libcdio
+PLIST_SUB+=	LIBCDIO=""
 .else
 CONFIGURE_ARGS+=--disable-libcdio
+PLIST_SUB+=	LIBCDIO="@comment "
+.endif
+
+.if !defined(WITHOUT_OPENJPEG)
+LIB_DEPENDS+=	openjpeg.2:${PORTSDIR}/graphics/openjpeg
+.else
+CONFIGURE_ARGS+=--disable-openjpeg
+.endif
+
+.if !defined(WITHOUT_SCHROEDINGER)
+LIB_DEPENDS+=	schroedinger-1.0.2:${PORTSDIR}/multimedia/schroedinger
+.else
+CONFIGURE_ARGS+=--disable-schroedinger
 .endif
 
 # vendor ocflags from configure
diff --git a/multimedia/gmerlin-avdecoder/distinfo b/multimedia/gmerlin-avdecoder/distinfo
index fe6c841cd241..5cd867b97f9a 100644
--- a/multimedia/gmerlin-avdecoder/distinfo
+++ b/multimedia/gmerlin-avdecoder/distinfo
@@ -1,3 +1,3 @@
-MD5 (gmerlin-avdecoder-0.1.8.tar.gz) = cefa2b135dbc9ada61b480351300f722
-SHA256 (gmerlin-avdecoder-0.1.8.tar.gz) = 2f561f792d26d9829e7a0fec54c5d05f6e733e864e7354c14232a6e93b0e024f
-SIZE (gmerlin-avdecoder-0.1.8.tar.gz) = 1345582
+MD5 (gmerlin-avdecoder-1.0.1.tar.gz) = 1ae5911a3d90d7afa773e949a1168f31
+SHA256 (gmerlin-avdecoder-1.0.1.tar.gz) = 97f127b1e8bf3e54f61f744f7cbd983d2cb28cb9ce3f149c2b92851ec30929d2
+SIZE (gmerlin-avdecoder-1.0.1.tar.gz) = 1393783
diff --git a/multimedia/gmerlin-avdecoder/pkg-plist b/multimedia/gmerlin-avdecoder/pkg-plist
index da5121a37ed0..d8b2d0fe1f61 100644
--- a/multimedia/gmerlin-avdecoder/pkg-plist
+++ b/multimedia/gmerlin-avdecoder/pkg-plist
@@ -1,15 +1,16 @@
 bin/bgavdump
 include/gmerlin/avdec.h
+include/gmerlin/bgavdefs.h
 include/gmerlin/bgav_version.h
 %%GMERLIN%%lib/gmerlin/plugins/i_avdec.la
 %%GMERLIN%%lib/gmerlin/plugins/i_avdec.so
-%%GMERLIN%%lib/gmerlin/plugins/i_dvd.la
-%%GMERLIN%%lib/gmerlin/plugins/i_dvd.so
-%%GMERLIN%%lib/gmerlin/plugins/i_vcd.la
-%%GMERLIN%%lib/gmerlin/plugins/i_vcd.so
+%%LIBCDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.la
+%%LIBCDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.so
+%%LIBCDIO%%lib/gmerlin/plugins/i_vcd.la
+%%LIBCDIO%%lib/gmerlin/plugins/i_vcd.so
 lib/libgmerlin_avdec.la
 lib/libgmerlin_avdec.so
-lib/libgmerlin_avdec.so.0
+lib/libgmerlin_avdec.so.1
 libdata/pkgconfig/gmerlin_avdec.pc
 share/locale/de/LC_MESSAGES/gmerlin-avdecoder.mo
 @dirrmtry include/gmerlin