aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zander <riggs@FreeBSD.org>2014-10-12 06:37:05 +0000
committerThomas Zander <riggs@FreeBSD.org>2014-10-12 06:37:05 +0000
commit7008a23bf0f83648980cabc6646b6091e5727da1 (patch)
tree691108ea083a1eff3b195ec23c1f9c57c5df6432
parent1b65171d2c7dacc1df68d869b54c73f8a4747785 (diff)
downloadports-7008a23bf0f83648980cabc6646b6091e5727da1.tar.gz
ports-7008a23bf0f83648980cabc6646b6091e5727da1.zip
MFH: r370633
- Fix build problem (plist generation) with export_xvid.so symlink - Make port ready for ffmpeg 2.4 and later - Pet portlint - Bump PORTREVISION - Resolve merge conflicts by getting port on par with head PR: 194161 Submitted by: cyberbotx@cyberbotx.com (maintainer) Approved by: portmgr(erwin)
Notes
Notes: svn path=/branches/2014Q4/; revision=370683
-rw-r--r--multimedia/transcode/Makefile35
-rw-r--r--multimedia/transcode/files/patch-import__probe_ffmpeg.c11
-rw-r--r--multimedia/transcode/pkg-plist130
3 files changed, 152 insertions, 24 deletions
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 938f64a6ddac..25dcb91c257c 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -3,7 +3,7 @@
PORTNAME= transcode
PORTVERSION= 1.1.7
-PORTREVISION= 16
+PORTREVISION= 18
CATEGORIES= multimedia
MASTER_SITES= http://cdn.bitbucket.org/france/transcode-tcforge/downloads/
@@ -14,20 +14,20 @@ LICENSE= GPLv2
LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-FAKEDIR= ${WRKDIR}/fake
-PLIST= ${WRKDIR}/plist
USE_LDCONFIG= yes
-USES= gmake pkgconfig tar:bzip2 libtool
+USES= gmake libtool pkgconfig tar:bzip2
+USE_GCC= any
WANT_SDL= yes
WANT_GNOME= yes
-USE_AUTOTOOLS= libtoolize
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-oss
CPPFLAGS+= -isystem ${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS+= --enable-oss
+INSTALL_TARGET= install-strip
NO_OPTIONS_SORT= yes
-OPTIONS_DEFINE= OPTIMIZED_CFLAGS X11 MPEG2 BKTR POSTPROC FREETYPE LAME XVID \
- X264 OGG VORBIS THEORA DVDREAD DV QUICKTIME LZO A52 \
+OPTIONS_DEFINE= DOCS OPTIMIZED_CFLAGS X11 MPEG2 BKTR POSTPROC FREETYPE LAME \
+ XVID X264 OGG VORBIS THEORA DVDREAD DV QUICKTIME LZO A52 \
FAAC LIBXML2 MJPEGTOOLS SDL IMAGEMAGICK JPEG ICONV V4L
OPTIONS_DEFAULT= LAME DVDREAD JPEG ICONV
BKTR_DESC= Bktr capture card support
@@ -139,8 +139,6 @@ post-patch:
s|-lMagick|-lMagickCore|g' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-pre-configure:
- @${REINPLACE_CMD} -E -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -E -e 's|-ldl||g' ${WRKSRC}/configure
@${REINPLACE_CMD} -E -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -E -e 's|WRKSRC|${WRKSRC}|g' ${WRKSRC}/export/Makefile.in
@@ -151,19 +149,8 @@ pre-configure:
${WRKSRC}/import/import_mov.c \
${WRKSRC}/import/probe_mov.c
-pre-install:
- ${RM} -rf ${PLIST} ${FAKEDIR}
- ${MKDIR} ${FAKEDIR}
- ${TOUCH} -f ${PLIST}
- @(cd ${WRKSRC} && ${MAKE_CMD} install prefix=${FAKEDIR} mandir=${FAKEDIR}/man)
-.for dir in bin share/doc lib
- @(cd ${FAKEDIR}/${dir} && ${FIND} -s * -type f -o -type l | \
- ${SED} -e 's|^|${dir}/|' | grep -v \\.la$$ >> ${PLIST})
- @(cd ${FAKEDIR}/${dir} && ${FIND} -d * -type d | \
- ${SED} -e 's|^|@dirrm ${dir}/|' >> ${PLIST})
-.endfor
- @(cd ${FAKEDIR}/man && ${FIND} -s * -type f -o -type l | \
- ${SED} -e 's|^|man/|' \
- -e 's|$$|.gz|' >> ${PLIST})
+post-stage:
+ @(cd ${STAGEDIR}${PREFIX} && \
+ ${FIND} -s lib/transcode -type f -or -type l >> ${TMPPLIST})
.include <bsd.port.mk>
diff --git a/multimedia/transcode/files/patch-import__probe_ffmpeg.c b/multimedia/transcode/files/patch-import__probe_ffmpeg.c
new file mode 100644
index 000000000000..9cc46c2c68fb
--- /dev/null
+++ b/multimedia/transcode/files/patch-import__probe_ffmpeg.c
@@ -0,0 +1,11 @@
+--- import/probe_ffmpeg.c.orig 2011-11-19 16:50:27 UTC
++++ import/probe_ffmpeg.c
+@@ -120,7 +120,7 @@
+
+ translate_info(lavf_dmx_context, ipipe->probe_info);
+
+- av_close_input_file(lavf_dmx_context);
++ avformat_close_input(lavf_dmx_context);
+ return;
+ }
+
diff --git a/multimedia/transcode/pkg-plist b/multimedia/transcode/pkg-plist
new file mode 100644
index 000000000000..372010adc8ef
--- /dev/null
+++ b/multimedia/transcode/pkg-plist
@@ -0,0 +1,130 @@
+bin/avifix
+bin/aviindex
+bin/avimerge
+bin/avisplit
+bin/avisync
+bin/tccat
+bin/tcdecode
+bin/tcdemux
+bin/tcextract
+bin/tcmodinfo
+bin/tcmp3cut
+bin/tcprobe
+bin/tcscan
+bin/tcxmlcheck
+bin/tcxpm2rgb
+bin/tcyait
+bin/transcode
+man/man1/avifix.1.gz
+man/man1/aviindex.1.gz
+man/man1/avimerge.1.gz
+man/man1/avisplit.1.gz
+man/man1/avisync.1.gz
+man/man1/tccat.1.gz
+man/man1/tcdecode.1.gz
+man/man1/tcdemux.1.gz
+man/man1/tcexport.1.gz
+man/man1/tcextract.1.gz
+man/man1/tcmodchain.1.gz
+man/man1/tcmodinfo.1.gz
+man/man1/tcprobe.1.gz
+man/man1/tcpvmexportd.1.gz
+man/man1/tcscan.1.gz
+man/man1/tcxmlcheck.1.gz
+man/man1/transcode.1.gz
+man/man1/transcode_export.1.gz
+man/man1/transcode_filter.1.gz
+man/man1/transcode_import.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/DV-to-DVD-HOWTO.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.Inverse.Telecine.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.cluster
+%%PORTDOCS%%%%DOCSDIR%%/README.dv
+%%PORTDOCS%%%%DOCSDIR%%/README.filter.modfps
+%%PORTDOCS%%%%DOCSDIR%%/README.rip
+%%PORTDOCS%%%%DOCSDIR%%/README.sync
+%%PORTDOCS%%%%DOCSDIR%%/README.vcd
+%%PORTDOCS%%%%DOCSDIR%%/README.xvid-credits
+%%PORTDOCS%%%%DOCSDIR%%/RELNOTES-0.6.13
+%%PORTDOCS%%%%DOCSDIR%%/RELNOTES-1.1.0
+%%PORTDOCS%%%%DOCSDIR%%/export_ffmpeg.txt
+%%PORTDOCS%%%%DOCSDIR%%/export_mp2.txt
+%%PORTDOCS%%%%DOCSDIR%%/faq
+%%PORTDOCS%%%%DOCSDIR%%/filter-socket.txt
+%%PORTDOCS%%%%DOCSDIR%%/filter_dnr.txt
+%%PORTDOCS%%%%DOCSDIR%%/filter_logo.txt
+%%PORTDOCS%%%%DOCSDIR%%/filter_logoaway.txt
+%%PORTDOCS%%%%DOCSDIR%%/filter_text.txt
+%%PORTDOCS%%%%DOCSDIR%%/filter_yuvdenoise.txt
+%%PORTDOCS%%%%DOCSDIR%%/framerate.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/dv.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dvd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/export_divx.html
+%%PORTDOCS%%%%DOCSDIR%%/html/export_divx4.php
+%%PORTDOCS%%%%DOCSDIR%%/html/export_divx5.php
+%%PORTDOCS%%%%DOCSDIR%%/html/export_fame.php
+%%PORTDOCS%%%%DOCSDIR%%/html/export_ogg.php
+%%PORTDOCS%%%%DOCSDIR%%/html/export_opendivx.php
+%%PORTDOCS%%%%DOCSDIR%%/html/export_xvid.php
+%%PORTDOCS%%%%DOCSDIR%%/html/import_avi.html
+%%PORTDOCS%%%%DOCSDIR%%/html/import_dv.html
+%%PORTDOCS%%%%DOCSDIR%%/html/import_dvd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/import_mp3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/import_mpeg2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/import_mpeg3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/import_null.html
+%%PORTDOCS%%%%DOCSDIR%%/html/import_nuv.html
+%%PORTDOCS%%%%DOCSDIR%%/html/import_ogg.php
+%%PORTDOCS%%%%DOCSDIR%%/html/import_raw.html
+%%PORTDOCS%%%%DOCSDIR%%/html/import_vob.html
+%%PORTDOCS%%%%DOCSDIR%%/html/import_yuv4mpeg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mes0-00000.png
+%%PORTDOCS%%%%DOCSDIR%%/html/mes4-00000.png
+%%PORTDOCS%%%%DOCSDIR%%/html/mes5-00000.png
+%%PORTDOCS%%%%DOCSDIR%%/html/mes6-00000.png
+%%PORTDOCS%%%%DOCSDIR%%/html/mes7-00000.png
+%%PORTDOCS%%%%DOCSDIR%%/html/misc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mpeg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/new.png
+%%PORTDOCS%%%%DOCSDIR%%/html/other.html
+%%PORTDOCS%%%%DOCSDIR%%/html/post.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pre.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smart.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sorry.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sub0-00000.png
+%%PORTDOCS%%%%DOCSDIR%%/html/sub1-00000.png
+%%PORTDOCS%%%%DOCSDIR%%/html/sub2-00000.png
+%%PORTDOCS%%%%DOCSDIR%%/html/sub3-00000.png
+%%PORTDOCS%%%%DOCSDIR%%/html/subtitles.html
+%%PORTDOCS%%%%DOCSDIR%%/html/table.php
+%%PORTDOCS%%%%DOCSDIR%%/html/tc.png
+%%PORTDOCS%%%%DOCSDIR%%/import-xml.txt
+%%PORTDOCS%%%%DOCSDIR%%/import_nvrec.txt
+%%PORTDOCS%%%%DOCSDIR%%/import_v4l2.txt
+%%PORTDOCS%%%%DOCSDIR%%/import_x11.txt
+%%PORTDOCS%%%%DOCSDIR%%/import_yuv.txt
+%%PORTDOCS%%%%DOCSDIR%%/pvm3/export_pvm.txt
+%%PORTDOCS%%%%DOCSDIR%%/pvm3/pvm_10x.cfg
+%%PORTDOCS%%%%DOCSDIR%%/pvm3/pvm_11x.cfg
+%%PORTDOCS%%%%DOCSDIR%%/pvm3/pvm_config.txt
+%%PORTDOCS%%%%DOCSDIR%%/tech/OPTIMIZERS
+%%PORTDOCS%%%%DOCSDIR%%/tech/architecture.txt
+%%PORTDOCS%%%%DOCSDIR%%/tech/avi_comments.txt
+%%PORTDOCS%%%%DOCSDIR%%/tech/clone.txt
+%%PORTDOCS%%%%DOCSDIR%%/tech/export-API.txt
+%%PORTDOCS%%%%DOCSDIR%%/tech/filter-API.txt
+%%PORTDOCS%%%%DOCSDIR%%/tech/filter_template.c
+%%PORTDOCS%%%%DOCSDIR%%/tech/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/html/tc_basic.css
+%%PORTDOCS%%%%DOCSDIR%%/tech/html/tc_frame_buffer.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/html/tc_input_rotation.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/html/tc_libraries.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/html/tc_logo.png
+%%PORTDOCS%%%%DOCSDIR%%/tech/ibp_support.txt
+%%PORTDOCS%%%%DOCSDIR%%/tech/import-API.txt
+%%PORTDOCS%%%%DOCSDIR%%/tech/libraries.txt
+%%PORTDOCS%%%%DOCSDIR%%/tech/module-system-API.txt
+%%PORTDOCS%%%%DOCSDIR%%/template.cfg.txt