fixes ffmpeg support and build problems (bugs #32522 and #32754)

6 files changed, 149 insertions, 14 deletions

diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index 794957cf9080..56946051864b 100644
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # $Header:
 
+*openh323-1.12.2-r2 (08 Nov 2003)
+
+  08 Nov 2003; <stkn@gentoo.org> openh323-1.12.2-r2.ebuild,
+  files/openh323-1.12.2-ffmpeg.diff, files/openh323-1.12.2-include-order.diff:
+  fixed ffmpeg detection and compiling (#32522 and #32754)
+
   03 Nov 2003; Stefan Knoblich <stkn@gentoo.org> openh323-1.12.0-r1.ebuild,
   files/openh323-1.12.0-include-order.diff:
   change order of include pathes in openh323u.mak, this fixes bug #32522
diff --git a/net-libs/openh323/Manifest b/net-libs/openh323/Manifest
index 8e5b7a58d08c..54015d102c05 100644
--- a/net-libs/openh323/Manifest
+++ b/net-libs/openh323/Manifest
@@ -1,14 +1,16 @@
-MD5 721421b9de90ecbdde90f38f8b8b281e ChangeLog 4554
+MD5 b1c93a48748ddab0a1123d96af85c4e7 ChangeLog 4788
 MD5 5ae9f140fcd4525c88ee9239bd8772a6 metadata.xml 267
 MD5 53e0a3534865471e42d38f10d6c06525 openh323-1.11.7.ebuild 1842
-MD5 2c20781a00f154e47e32e5db1b729778 openh323-1.12.0-r1.ebuild 2834
-MD5 a39c20e3a19715bb753b8d9ef6b67264 openh323-1.12.2.ebuild 2793
-MD5 4859f1257934ee01b381308cbb290d2d openh323-1.9.10-r1.ebuild 1117
 MD5 734d7c974cf9de7584c3705c8c79b72c openh323-1.12.2-r1.ebuild 3119
+MD5 4859f1257934ee01b381308cbb290d2d openh323-1.9.10-r1.ebuild 1117
+MD5 e9205444db331d8fa23a4f32a3e60e41 openh323-1.12.2-r2.ebuild 3243
+MD5 2c20781a00f154e47e32e5db1b729778 openh323-1.12.0-r1.ebuild 2834
 MD5 e9ac1227eaf205c20f84a4fc712e8d66 files/digest-openh323-1.11.7 68
 MD5 238a3a0b91aabce0a61e0dd5c4b9ee68 files/digest-openh323-1.12.0-r1 68
-MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2 68
+MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r1 68
 MD5 47caff52a16cf5135ad984dcfe022f6a files/digest-openh323-1.9.10-r1 68
 MD5 c3dd75b2e6b09b4f5cc5b88a12064159 files/openh323-1.11.7-emptyMakefile 8
-MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r1 68
 MD5 3f59306b619abf22dd5338af0c4c099b files/openh323-1.12.0-include-order.diff 1326
+MD5 76afb2b1c9c9e4aa4414531ffdd812e9 files/openh323-1.12.2-ffmpeg.diff 1899
+MD5 767748fd04f2626be4c6914e110a1676 files/openh323-1.12.2-include-order.diff 1361
+MD5 2efc1a39c75805caacb974bfa6208dea files/digest-openh323-1.12.2-r2 68
diff --git a/net-libs/openh323/files/digest-openh323-1.12.2 b/net-libs/openh323/files/digest-openh323-1.12.2-r2
index 4f6acaf41c0f..4f6acaf41c0f 100644
--- a/net-libs/openh323/files/digest-openh323-1.12.2
+++ b/net-libs/openh323/files/digest-openh323-1.12.2-r2
diff --git a/net-libs/openh323/files/openh323-1.12.2-ffmpeg.diff b/net-libs/openh323/files/openh323-1.12.2-ffmpeg.diff
new file mode 100644
index 000000000000..e93db8302b7a
--- /dev/null
+++ b/net-libs/openh323/files/openh323-1.12.2-ffmpeg.diff
@@ -0,0 +1,52 @@
+--- configure.orig	2003-11-05 01:44:44.000000000 +0100
++++ configure	2003-11-05 01:57:55.000000000 +0100
+@@ -3384,15 +3384,16 @@
+ echo "${ECHO_T}$ac_cv_lib_avcodec_avcodec_open" >&6
+ if test $ac_cv_lib_avcodec_avcodec_open = yes; then
+   H323_AVCODEC=1
++  AVCODECINCLUDEDIR="/usr/include"
+ else
+   H323_AVCODEC=
+ fi
+ 
+ fi
+ 
+-if test "${H323_AVCODEC:-unset}" != "unset" ; then
+-  echo "$as_me:$LINENO: checking for /usr/local/include/ffmpeg/avcodec.h" >&5
+-echo $ECHO_N "checking for /usr/local/include/ffmpeg/avcodec.h... $ECHO_C" >&6
++if test "${H323_AVCODEC:-unset}" = "unset" ; then
++  echo "$as_me:$LINENO: checking for /usr/include/ffmpeg/avcodec.h" >&5
++echo $ECHO_N "checking for /usr/include/ffmpeg/avcodec.h... $ECHO_C" >&6
+ if test "${ac_cv_file__usr_local_include_ffmpeg_avcodec_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3400,7 +3401,7 @@
+   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+ echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+-if test -r "/usr/local/include/ffmpeg/avcodec.h"; then
++if test -r "/usr/include/ffmpeg/avcodec.h"; then
+   ac_cv_file__usr_local_include_ffmpeg_avcodec_h=yes
+ else
+   ac_cv_file__usr_local_include_ffmpeg_avcodec_h=no
+@@ -3410,6 +3411,7 @@
+ echo "${ECHO_T}$ac_cv_file__usr_local_include_ffmpeg_avcodec_h" >&6
+ if test $ac_cv_file__usr_local_include_ffmpeg_avcodec_h = yes; then
+   H323_AVCODEC=1
++  AVCODECINCLUDEDIR="/usr/include/ffmpeg"
+ fi
+ 
+ fi
+@@ -3422,9 +3424,10 @@
+ #define H323_AVCODEC 1
+ _ACEOF
+ 
+-  AVCODECINCLUDEDIR=/usr/local/include/ffmpeg
+-  AVCODECLIBDIR=/usr/local/lib
++  AVCODECLIBDIR=/usr/lib
+   STDCCFLAGS="$STDCCFLAGS -I${AVCODECINCLUDEDIR}"
++  LDFLAGS="$LDFLAGS -L${AVCODECLIBDIR}"
++  ENDLDLIBS="-lavcodec $ENDLDLIBS"
+ 
+   echo  "                      H263 codec on FFmpeg library  enabled"
+ fi
diff --git a/net-libs/openh323/files/openh323-1.12.2-include-order.diff b/net-libs/openh323/files/openh323-1.12.2-include-order.diff
new file mode 100644
index 000000000000..9317fd2a8217
--- /dev/null
+++ b/net-libs/openh323/files/openh323-1.12.2-include-order.diff
@@ -0,0 +1,63 @@
+--- openh323u.mak.in.orig	2003-11-03 19:05:49.000000000 +0100
++++ openh323u.mak.in	2003-11-03 19:07:11.000000000 +0100
+@@ -127,12 +127,26 @@
+ #
+ 
+ PWLIBDIR	= @PWLIBDIR@
+-STDCCFLAGS	+= @STDCCFLAGS@
+ LDFLAGS		+= @LDFLAGS@
+ ENDLDLIBS	:= @ENDLDLIBS@ $(ENDLDLIBS)
+ H323_AVCODEC	= @H323_AVCODEC@
+ H323_VICH263	= @H323_VICH263@      
+ 
++#
++# stkn@gentoo.org
++# moved stuff around, this should fix problems with include order
++# blame me if this breaks things...
++#
++OH323_SRCDIR = $(OPENH323DIR)/src
++ifdef PREFIX
++OH323_INCDIR = $(PREFIX)/include/openh323
++else
++OH323_INCDIR = $(OPENH323DIR)/include
++endif
++OH323_LIBDIR = $(OPENH323DIR)/lib
++
++STDCCFLAGS   += -I$(OH323_INCDIR) @STDCCFLAGS@
++
+ ifdef LIBRARY_MAKEFILE
+ include $(PWLIBDIR)/make/unix.mak
+ else
+@@ -147,16 +161,6 @@
+ 
+ #OH323_SUPPRESS_H235	= 1
+ 
+-
+-OH323_SRCDIR = $(OPENH323DIR)/src
+-ifdef PREFIX
+-OH323_INCDIR = $(PREFIX)/include/openh323
+-else
+-OH323_INCDIR = $(OPENH323DIR)/include
+-endif
+-OH323_LIBDIR = $(OPENH323DIR)/lib
+-
+-
+ ifdef NOTRACE
+ STDCCFLAGS += -DPASN_NOPRINTON -DPASN_LEANANDMEAN
+ OH323_SUFFIX = n
+@@ -175,15 +179,12 @@
+ endif
+ 
+ 
+-
+ OH323_BASE  = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
+ OH323_FILE  = lib$(OH323_BASE).$(LIB_SUFFIX)
+ 
+ LDFLAGS	    += -L$(OH323_LIBDIR)
+ LDLIBS	    := -l$(OH323_BASE) $(LDLIBS)
+ 
+-STDCCFLAGS  += -I$(OH323_INCDIR)
+-
+ 
+ ifneq ($(OS),Nucleus)
+ 
diff --git a/net-libs/openh323/openh323-1.12.2.ebuild b/net-libs/openh323/openh323-1.12.2-r2.ebuild
index 52c1debb7102..5debf7b14c34 100644
--- a/net-libs/openh323/openh323-1.12.2.ebuild
+++ b/net-libs/openh323/openh323-1.12.2-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.2.ebuild,v 1.4 2003/09/09 17:18:08 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.2-r2.ebuild,v 1.1 2003/11/08 18:33:54 stkn Exp $
+
+inherit eutils
 
 IUSE="ssl"
 
@@ -11,11 +13,11 @@ SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-1.1"
-KEYWORDS="~x86 ~ppc -sparc "
+KEYWORDS="~x86 ~ppc -sparc"
 
 DEPEND=">=sys-apps/sed-4
 	>=dev-libs/pwlib-1.5.2
-	>=media-video/ffmpeg-0.4.7_pre20030624
+	>=media-video/ffmpeg-0.4.7
 	ssl? ( dev-libs/openssl )"
 
 MAKEOPTS="${MAKEOPTS} -j1"
@@ -39,8 +41,13 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	# enabling ffmpeg/h263 support
-	cd ${S}; sed -i -e "s:/usr/local/include/ffmpeg:/usr/include/ffmpeg:" configure
+
+	cd ${S}
+	# fix and enable ffmpeg/h263 support (bug #32754)
+	epatch ${FILESDIR}/openh323-${PV}-ffmpeg.diff
+
+	# fix include order (bug #32522)
+	epatch ${FILESDIR}/openh323-${PV}-include-order.diff
 }
 
 src_compile() {
@@ -53,7 +60,6 @@ src_compile() {
 	# NOTRACE avoid compilation problems, we disable PTRACING using NOTRACE=1
 	makeopts="${makeopts} ASNPARSER=/usr/bin/asnparser NOTRACE=1"
 
-
 	if [ "`use ssl`" ]; then
 		export OPENSSLFLAG=1
 		export OPENSSLDIR=/usr
@@ -79,6 +85,8 @@ src_install() {
 	# mod to keep gnugk happy
 	insinto /usr/share/openh323/src
 	newins ${FILESDIR}/openh323-1.11.7-emptyMakefile Makefile
+
+	# install version.h into $OPENH323DIR
 	insinto /usr/share/openh323
 	doins version.h
 
@@ -93,6 +101,10 @@ src_install() {
 	done
 	dosym /usr/lib/libh323_${OPENH323_ARCH}.so.${PV} /usr/lib/libh323_${ALT_ARCH}.so
 
+	# these should point to the right directories,
+	# openh323.org and other applications need this
+	dosed "s:^OH323_LIBDIR = \$(OPENH323DIR).*:OH323_LIBDIR = /usr/lib:" \
+		/usr/share/openh323/openh323u.mak
+	dosed "s:^OH323_INCDIR = \$(OPENH323DIR).*:OH323_INCDIR = /usr/include/openh323:" \
+		/usr/share/openh323/openh323u.mak
 }
-
-