- Update to version 1.1.0
Responsible Changed From-To: freebsd-ports-bugs->miwi miwi@ wants his PRs (via the GNATS Auto Assign Tool)
State Changed From-To: open->feedback build failed http://gecko.miwibox.org/index.php?action=describe_port&id=1767
Here is the corrected patch. diff -urN /usr/ports/multimedia/gmerlin-avdecoder/Makefile multimedia/gmerlin-avdecoder/Makefile --- /usr/ports/multimedia/gmerlin-avdecoder/Makefile 2011-06-25 14:16:14.000000000 +0900 +++ multimedia/gmerlin-avdecoder/Makefile 2011-07-02 20:14:09.000000000 +0900 @@ -6,26 +6,16 @@ # PORTNAME= gmerlin-avdecoder -PORTVERSION= 1.0.1 -PORTREVISION= 13 +PORTVERSION= 1.1.0 CATEGORIES= multimedia MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION} MAINTAINER= ports@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 \ @@ -43,17 +33,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 @@ -72,7 +67,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) @@ -94,12 +89,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 @@ -169,12 +158,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) @@ -196,20 +185,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/distinfo multimedia/gmerlin-avdecoder/distinfo --- /usr/ports/multimedia/gmerlin-avdecoder/distinfo 2011-07-04 02:09:24.000000000 +0900 +++ multimedia/gmerlin-avdecoder/distinfo 2011-06-28 01:05:15.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (gmerlin-avdecoder-1.0.1.tar.gz) = 97f127b1e8bf3e54f61f744f7cbd983d2cb28cb9ce3f149c2b92851ec30929d2 -SIZE (gmerlin-avdecoder-1.0.1.tar.gz) = 1393783 +SHA256 (gmerlin-avdecoder-1.1.0.tar.gz) = b0a9efcf152321d8829d2023660c8d14fdde894dc8881bdd67269c4f4cb4cc35 +SIZE (gmerlin-avdecoder-1.1.0.tar.gz) = 1472068 diff -urN /usr/ports/multimedia/gmerlin-avdecoder/pkg-plist multimedia/gmerlin-avdecoder/pkg-plist --- /usr/ports/multimedia/gmerlin-avdecoder/pkg-plist 2009-08-12 16:04:48.000000000 +0900 +++ multimedia/gmerlin-avdecoder/pkg-plist 2011-07-02 20:14:28.000000000 +0900 @@ -1,16 +1,21 @@ +bin/bgavdemux 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 -%%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
State Changed From-To: feedback->open Feedback received
Responsible Changed From-To: miwi->freebsd-ports-bugs Back to pool at assignee request for the moment.
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@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
Responsible Changed From-To: freebsd-ports-bugs->ehaupt I will take care of it.
ehaupt 2011-08-10 14:30:37 UTC FreeBSD ports repository Modified files: multimedia/gmerlin-avdecoder Makefile pkg-plist Log: Update to 1.1.0 PR: 158467 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Revision Changes Path 1.26 +29 -38 ports/multimedia/gmerlin-avdecoder/Makefile 1.5 +8 -4 ports/multimedia/gmerlin-avdecoder/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, thanks!