Date: Tue, 29 Jul 2008 09:38:39 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/126061: [ports] multimedia/ffmpeg: fix compat headers installation Message-ID: <20080729013839.D1689209D@sunpoet.net> Resent-Message-ID: <200807290140.m6T1e0HD062545@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 126061
>Category: ports
>Synopsis: [ports] multimedia/ffmpeg: fix compat headers installation
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 29 01:40:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 7.0-STABLE amd64
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD bonjour.sunpoet.net 7.0-STABLE FreeBSD 7.0-STABLE #9: Mon Jul 14 22:39:26 CST 2008 root@bonjour.sunpoet.net:/usr/obj/usr/src/sys/bonjour amd64
>Description:
For ffmpeg prior to 20080727 shapsnot, postprocess.h was originally installed in ${PREFIX}/include/postproc/, not ${PREFIX}/include/ffmpeg/.
( http://www.freebsd.org/cgi/cvsweb.cgi/ports/multimedia/ffmpeg/pkg-plist.diff?r1=1.20;r2=1.21;f=h )
>How-To-Repeat:
>Fix:
--- /usr/ports/multimedia/ffmpeg/Makefile.orig 2008-07-29 09:06:28.831710000 +0800
+++ /usr/ports/multimedia/ffmpeg/Makefile 2008-07-29 09:26:47.447786849 +0800
@@ -37,29 +37,28 @@
XVID "XVID codec" off
COMPAT_HEADERS= libavcodec/avcodec.h \
- libavcodec/opt.h \
- libavdevice/avdevice.h \
- libavformat/avformat.h \
- libavformat/avio.h \
- libavformat/rtsp.h \
- libavformat/rtspcodes.h \
- libavutil/adler32.h \
- libavutil/avstring.h \
- libavutil/avutil.h \
- libavutil/base64.h \
- libavutil/common.h \
- libavutil/crc.h \
- libavutil/fifo.h \
- libavutil/intfloat_readwrite.h \
- libavutil/log.h \
- libavutil/lzo.h \
- libavutil/mathematics.h \
- libavutil/md5.h \
- libavutil/mem.h \
- libavutil/random.h \
- libavutil/rational.h \
- libavutil/sha1.h \
- libpostproc/postprocess.h
+ libavcodec/opt.h \
+ libavdevice/avdevice.h \
+ libavformat/avformat.h \
+ libavformat/avio.h \
+ libavformat/rtsp.h \
+ libavformat/rtspcodes.h \
+ libavutil/adler32.h \
+ libavutil/avstring.h \
+ libavutil/avutil.h \
+ libavutil/base64.h \
+ libavutil/common.h \
+ libavutil/crc.h \
+ libavutil/fifo.h \
+ libavutil/intfloat_readwrite.h \
+ libavutil/log.h \
+ libavutil/lzo.h \
+ libavutil/mathematics.h \
+ libavutil/md5.h \
+ libavutil/mem.h \
+ libavutil/random.h \
+ libavutil/rational.h \
+ libavutil/sha1.h
.include <bsd.port.pre.mk>
@@ -315,5 +314,6 @@
.for FILE in ${COMPAT_HEADERS}
${CP} -f ${PREFIX}/include/${FILE} ${PREFIX}/include/ffmpeg/${FILE:C,^[^/]+/([^/]+).*,\1,}
.endfor
+ ${CP} -f ${PREFIX}/include/libpostproc/postprocess.h ${PREFIX}/include/postproc/postprocess.h
.include <bsd.port.post.mk>
--- /usr/ports/multimedia/ffmpeg/pkg-plist.orig 2008-07-29 09:06:28.832713000 +0800
+++ /usr/ports/multimedia/ffmpeg/pkg-plist 2008-07-29 09:32:54.287424848 +0800
@@ -20,7 +20,6 @@
include/ffmpeg/md5.h
include/ffmpeg/mem.h
include/ffmpeg/opt.h
-include/ffmpeg/postprocess.h
include/ffmpeg/random.h
include/ffmpeg/rational.h
include/ffmpeg/rtsp.h
@@ -50,6 +49,7 @@
include/libavutil/rational.h
include/libavutil/sha1.h
include/libpostproc/postprocess.h
+include/postproc/postprocess.h
lib/libavcodec.a
lib/libavcodec.so
lib/libavcodec.so.1
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080729013839.D1689209D>