From sunpoet@sunpoet.net  Tue Jul 29 01:38:51 2008
Return-Path: <sunpoet@sunpoet.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CD2371065672
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 Jul 2008 01:38:51 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: from sunpoet.net (sunpoet.net [203.204.205.212])
	by mx1.freebsd.org (Postfix) with ESMTP id A04A38FC1B
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 Jul 2008 01:38:51 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: by sunpoet.net (Postfix, from userid 1000)
	id D1689209D; Tue, 29 Jul 2008 09:38:39 +0800 (CST)
Message-Id: <20080729013839.D1689209D@sunpoet.net>
Date: Tue, 29 Jul 2008 09:38:39 +0800 (CST)
From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
Reply-To: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [ports] multimedia/ffmpeg: fix compat headers installation 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         126061
>Category:       ports
>Synopsis:       multimedia/ffmpeg: fix compat headers installation
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-multimedia
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 29 01:40:00 UTC 2008
>Closed-Date:    Tue Aug 05 03:03:14 UTC 2008
>Last-Modified:  Tue Aug  5 03:10:03 UTC 2008
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-multimedia 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jul 29 01:40:09 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126061 
State-Changed-From-To: open->closed 
State-Changed-By: mezz 
State-Changed-When: Tue Aug 5 03:03:00 UTC 2008 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126061 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/126061: commit references a PR
Date: Tue,  5 Aug 2008 03:02:50 +0000 (UTC)

 mezz        2008-08-05 03:02:40 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/ffmpeg    Makefile pkg-plist 
   Log:
   Fix compat headers installation, bump the PORTREVISION.
   
   PR:             ports/126061
   Submitted by:   Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
   Approved by:    marcus
   
   Revision  Changes    Path
   1.83      +5 -3      ports/multimedia/ffmpeg/Makefile
   1.23      +2 -1      ports/multimedia/ffmpeg/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"
 
>Unformatted:
