Date: Mon, 21 Oct 2013 17:30:55 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331161 - head/multimedia/dvdstyler Message-ID: <201310211730.r9LHUtO8038315@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Mon Oct 21 17:30:54 2013 New Revision: 331161 URL: http://svnweb.freebsd.org/changeset/ports/331161 Log: multimedia/dvdstyler: link against ffmpeg - Link against ffmpeg - Allow staging - USES desktop-file-utils gmake - Convert lib depends to new format Modified: head/multimedia/dvdstyler/Makefile head/multimedia/dvdstyler/pkg-plist Modified: head/multimedia/dvdstyler/Makefile ============================================================================== --- head/multimedia/dvdstyler/Makefile Mon Oct 21 17:24:13 2013 (r331160) +++ head/multimedia/dvdstyler/Makefile Mon Oct 21 17:30:54 2013 (r331161) @@ -20,9 +20,9 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers mplex:${PORTSDIR}/multimedia/mjpegtools \ growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ docbook-sk>=4.1.2:${PORTSDIR}/textproc/docbook-sk \ - xmlto:${PORTSDIR}/textproc/xmlto -LIB_DEPENDS= exif:${PORTSDIR}/graphics/libexif \ - avcodec1:${PORTSDIR}/multimedia/ffmpeg1 + xmlto:${PORTSDIR}/textproc/xmlto +LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \ + libavcodec.so:${PORTSDIR}/multimedia/ffmpeg RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \ wxsvg>=1.1.14:${PORTSDIR}/graphics/wxsvg \ dvdauthor:${PORTSDIR}/multimedia/dvdauthor \ @@ -33,27 +33,15 @@ RUN_DEPENDS= zip:${PORTSDIR}/archivers/z OPTIONS_DEFINE= GNOME DOCS USE_BZIP2= yes -USES= gettext pkgconfig +USES= desktop-file-utils gettext gmake pkgconfig USE_WX= 2.8 WX_COMPS= wx svg WX_CONF_ARGS= absolute -USE_GNOME= desktopfileutils -USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBAV_CFLAGS="${LIBAV_CFLAGS}" LIBAV_LIBS="${LIBAV_LIBS}" \ - ac_cv_path_FFMPEG_PATH="${LOCALBASE}/bin/ffmpeg1" -MAKE_ENV= AM_CPPFLAGS="${LIBAV_CFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= dvdstyler.1 - -LIBAV_PC= libavcodec1 libavformat1 libavutil1 libswscale1 -LIBAV_CFLAGS= $$(pkg-config --cflags ${LIBAV_PC}) -LIBAV_LIBS= $$(pkg-config --libs ${LIBAV_PC}) - -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGNOME} @@ -91,14 +79,15 @@ post-patch: ${WRKSRC}/src/BurnDlg.cpp @${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|g' \ ${WRKSRC}/src/Config.h + @${REINPLACE_CMD} -e 's|CodecID|AVCodecID|g' \ + ${WRKSRC}/src/mediaenc_ffmpeg.cpp post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS ChangeLog INSTALL README - (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor .endif - @-update-desktop-database .include <bsd.port.mk> Modified: head/multimedia/dvdstyler/pkg-plist ============================================================================== --- head/multimedia/dvdstyler/pkg-plist Mon Oct 21 17:24:13 2013 (r331160) +++ head/multimedia/dvdstyler/pkg-plist Mon Oct 21 17:30:54 2013 (r331161) @@ -158,6 +158,7 @@ share/applications/dvdstyler.desktop %%DATADIR%%/templates/Travel/travel.png %%DATADIR%%/templates/Travel/travelWS.dvdt %%DATADIR%%/templates/Travel/travelWS.png +man/man1/dvdstyler.1.gz share/locale/ar/LC_MESSAGES/dvdstyler.mo share/locale/ca/LC_MESSAGES/dvdstyler.mo share/locale/cs/LC_MESSAGES/dvdstyler.mo @@ -211,5 +212,3 @@ share/pixmaps/dvdstyler.png @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry share/applications -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310211730.r9LHUtO8038315>