ports/158467: Update port: multimedia/gmerlin-avdecoder to 1.1.0

[KATO Tsuguru]

The following reply was made to PR ports/158467; it has been noted by GNATS.

From: KATO Tsuguru <tkato432 at yahoo.com>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/158467: Update port: multimedia/gmerlin-avdecoder to
 1.1.0
Date: Fri, 22 Jul 2011 16:30:05 +0900

 Remake of the patch against current tree.
 
 
 diff -urN /usr/ports/multimedia/gmerlin-avdecoder/Makefile multimedia/gmerlin-avdecoder/Makefile
 --- /usr/ports/multimedia/gmerlin-avdecoder/Makefile	2011-07-22 15:52:21.000000000 +0900
 +++ multimedia/gmerlin-avdecoder/Makefile	2011-07-22 16:26:06.000000000 +0900
 @@ -7,24 +7,16 @@
  
  PORTNAME=	gmerlin-avdecoder
  PORTVERSION=	1.1.0
 +PORTREVISION=	1
  CATEGORIES=	multimedia
  MASTER_SITES=	SF/gmerlin/${PORTNAME}/${PORTVERSION}
  
  MAINTAINER=	ports at FreeBSD.org
  COMMENT=	General purpose media decoding library
  
 +BUILD_DEPENDS=	${LOCALBASE}/include/linux/dvb/frontend.h:${PORTSDIR}/multimedia/v4l_compat
  LIB_DEPENDS=	gavl.1:${PORTSDIR}/multimedia/gavl
  
 -GNU_CONFIGURE=	yes
 -USE_GETTEXT=	yes
 -CONFIGURE_ARGS=	--without-cpuflags --without-doxygen
 -USE_GNOME=	gnomehack pkgconfig
 -USE_LDCONFIG=	yes
 -
 -CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 -
 -PORTDOCS=	README
 -
  OPTIONS=	GMERLIN	"Enable gmerlin support" on \
  		FFMPEG	"Enable ffmpeg support" on \
  		THEORA	"Enable theora support" on \
 @@ -42,17 +34,22 @@
  		MAD	"Enable mp3 support" on \
  		A52	"Enable A52 support" on \
  		DCA	"Enable DTS Coherent Acoustics decoder" on \
 -		LIBCDIO	"Enable libcdio support" on \
 +		CDIO	"Enable libcdio support" on \
  		OPENJPEG "Enable JPEG2000 support" on \
  		SCHROEDINGER "Enable dirac support" on \
  		OPTIMIZED_CFLAGS "Additional optimizations" on
  
 -.include <bsd.port.pre.mk>
 +USE_GNOME=	gnomehack pkgconfig
 +USE_GETTEXT=	yes
 +GNU_CONFIGURE=	yes
 +CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 +CONFIGURE_ARGS=	--without-cpuflags --without-doxygen
 +USE_LDCONFIG=	yes
  
 -# Hack for 6.x to properly detect ffmpeg
 -.if ${OSVERSION} < 700000
 -CONFIGURE_ENV+=	AVCODEC_LIBS="`pkg-config --libs libavcodec` ${PTHREAD_LIBS}"
 -.endif
 +CPPFLAGS=	-I${LOCALBASE}/include
 +LDFLAGS=	-L${LOCALBASE}/lib
 +
 +.include <bsd.port.pre.mk>
  
  .if !defined(WITHOUT_GMERLIN)
  LIB_DEPENDS+=	gmerlin.0:${PORTSDIR}/multimedia/gmerlin
 @@ -71,7 +68,7 @@
  .if !defined(WITHOUT_THEORA)
  LIB_DEPENDS+=	theora.0:${PORTSDIR}/multimedia/libtheora
  .else
 -CONFIGURE_ARGS+=--disable-theora
 +CONFIGURE_ARGS+=--disable-theoradec
  .endif
  
  .if !defined(WITHOUT_SPEEX)
 @@ -93,12 +90,6 @@
  CONFIGURE_ARGS+=--disable-vorbis
  .endif
  
 -.if !defined(WITHOUT_VORBIS)
 -LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 -.else
 -CONFIGURE_ARGS+=--disable-vorbis
 -.endif
 -
  .if !defined(WITHOUT_MPEG2)
  LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
  .else
 @@ -168,12 +159,12 @@
  CONFIGURE_ARGS+=--disable-libcda --disable-libdca
  .endif
  
 -.if !defined(WITHOUT_LIBCDIO)
 +.if !defined(WITHOUT_CDIO)
  LIB_DEPENDS+=	cdio.12:${PORTSDIR}/sysutils/libcdio
 -PLIST_SUB+=	LIBCDIO=""
 +PLIST_SUB+=	CDIO=""
  .else
  CONFIGURE_ARGS+=--disable-libcdio
 -PLIST_SUB+=	LIBCDIO="@comment "
 +PLIST_SUB+=	CDIO="@comment "
  .endif
  
  .if !defined(WITHOUT_OPENJPEG)
 @@ -195,20 +186,20 @@
  .endif
  
  post-patch:
 -	@${REINPLACE_CMD} -e 's|-O3 -funroll-all-loops -ffast-math||g; \
 -		/LIBS/ s|-ldl||g; s|^LDFLAGS="|&$${LDFLAGS} |' \
 -		${WRKSRC}/configure
 -	@${REINPLACE_CMD} -e 's|#if DVDREAD_VERSION < 905|#if DVDREAD_VERSION < 904|' \
 -		${WRKSRC}/configure
 -	@${REINPLACE_CMD} -e '/^LIBS = / s|$$| @LIBINTL@ -lz|' \
 -		${WRKSRC}/tests/Makefile.in
 -	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/lib/in_smb.c
 -	@${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
 -		${WRKSRC}/lib/pngreader.c
 +	@${REINPLACE_CMD} -e \
 +		's|-O3 -funroll-all-loops -ffast-math||g; \
 +		 /LIBS/ s|-ldl||g; \
 +		 s|^LDFLAGS="|&$${LDFLAGS} |' ${WRKSRC}/configure
 +	@${REINPLACE_CMD} -e \
 +		's|#if DVDREAD_VERSION < 905|#if DVDREAD_VERSION < 904|' ${WRKSRC}/configure
 +	@${REINPLACE_CMD} -e \
 +		'/^LIBS = / s|$$| @LIBINTL@ -lz|' ${WRKSRC}/tests/Makefile.in
 +	@${REINPLACE_CMD} -e \
 +		's|malloc.h|stdlib.h|' ${WRKSRC}/lib/in_smb.c
  
 -.if !defined(NOPORTDOCS)
  post-install:
 -	${MKDIR} ${DOCSDIR}
 +.if !defined(NOPORTDOCS)
 +	@${MKDIR} ${DOCSDIR}
  	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
  .endif
  
 diff -urN /usr/ports/multimedia/gmerlin-avdecoder/pkg-plist multimedia/gmerlin-avdecoder/pkg-plist
 --- /usr/ports/multimedia/gmerlin-avdecoder/pkg-plist	2011-07-22 15:52:23.000000000 +0900
 +++ multimedia/gmerlin-avdecoder/pkg-plist	2011-07-02 20:14:28.000000000 +0900
 @@ -5,13 +5,17 @@
  include/gmerlin/bgav_version.h
  %%GMERLIN%%lib/gmerlin/plugins/i_avdec.la
  %%GMERLIN%%lib/gmerlin/plugins/i_avdec.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
 +%%CDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.la
 +%%CDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.so
 +lib/gmerlin/plugins/i_dvb.la
 +lib/gmerlin/plugins/i_dvb.so
 +%%CDIO%%lib/gmerlin/plugins/i_vcd.la
 +%%CDIO%%lib/gmerlin/plugins/i_vcd.so
  lib/libgmerlin_avdec.la
  lib/libgmerlin_avdec.so
  lib/libgmerlin_avdec.so.1
  libdata/pkgconfig/gmerlin_avdec.pc
 +%%PORTDOCS%%%%DOCSDIR%%/README
  share/locale/de/LC_MESSAGES/gmerlin-avdecoder.mo
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrmtry include/gmerlin