Date: Fri, 25 Jul 2014 03:24:32 +0000 From: "Montgomery-Smith, Stephen" <stephen@missouri.edu> To: FreeBSD Ports <freebsd-ports@FreeBSD.org> Subject: Bugzilla issue Message-ID: <53D1CDEE.6000002@missouri.edu>
index | next in thread | raw e-mail
[-- Attachment #1 --]
I am posting to freebsd-ports, but that probably isn't the right place.
I was trying to post a patch to bug 192074. I gave it the patch I
attached. But for some reason, bugzilla couldn't handle the patch to
patch-configure. This patch was created using "svn diff". Bugzilla
didn't want to accept a patch that was against an empty or non-existent
file.
[-- Attachment #2 --]
Index: Makefile
===================================================================
--- Makefile (revision 362293)
+++ Makefile (working copy)
@@ -41,7 +41,7 @@
.endif
.if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+= libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
CONFIGURE_ARGS+= --enable-ffmpeg
.endif
@@ -58,6 +58,10 @@
${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \
${WRKSRC}/ng/ngappinit.cpp
+post-configure:
+ ${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" \
+ ${WRKSRC}/configure
+
post-install:
# copy some additional headers for build cad/salome-netgenplugin
${MKDIR} ${STAGEDIR}${DATADIR}/include
Index: files/patch-configure
===================================================================
--- files/patch-configure (revision 0)
+++ files/patch-configure (working copy)
@@ -0,0 +1,14 @@
+--- configure-orig 2014-07-24 20:42:11.000000000 -0500
++++ configure 2014-07-24 20:43:21.000000000 -0500
+@@ -15361,9 +15361,9 @@
+ ffmpegon=false
+ # Check whether --enable-ffmpeg was given.
+ if test "${enable_ffmpeg+set}" = set; then :
+- enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-DFFMPEG -D__STDC_CONSTANT_MACROS"
++ enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-I%%LOCALBASE%%/include/ffmpeg0 -DFFMPEG -D__STDC_CONSTANT_MACROS"
+
+- FFMPEG_LIBS="-lavutil -lavformat -lavcodec -lavutil -lswscale -lz -lbz2"
++ FFMPEG_LIBS="-L%%LOCALBASE%%/lib/ffmpeg0 -lavutil0 -lavformat0 -lavcodec0 -lavutil0 -lswscale -lz -lbz2"
+
+ if test "$enableval" = yes; then ffmpegon=true; else ffmpegon=false; fi
+
home |
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53D1CDEE.6000002>