new version, copyright header updates

9 files changed, 233 insertions, 9 deletions

diff --git a/net-libs/openh323/ChangeLog b/net-libs/openh323/ChangeLog
index cd4ecc779398..63c117414298 100644
--- a/net-libs/openh323/ChangeLog
+++ b/net-libs/openh323/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/openh323
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/ChangeLog,v 1.30 2004/03/09 02:06:52 stkn Exp $
+
+*openh323-1.13.2 (09 Mar 2004)
+
+  09 Mar 2004; Stefan Knoblich <stkn@gentoo.org> openh323-1.13.2.ebuild,
+  files/openh323-1.13.2-ffmpeg.diff, files/openh323-1.13.2-include-order.diff:
+  new version, copyright header updates
 
   13 Feb 2004; Stefan Knoblich <stkn@gentoo.org> openh323-1.12.2-r2.ebuild:
   added warning message for >=gcc-3.3.2 users, regarding possible compiler
diff --git a/net-libs/openh323/files/digest-openh323-1.13.2 b/net-libs/openh323/files/digest-openh323-1.13.2
new file mode 100644
index 000000000000..2f836c8e94ca
--- /dev/null
+++ b/net-libs/openh323/files/digest-openh323-1.13.2
@@ -0,0 +1 @@
+MD5 b63e0ae7555facdbeab5be8b407d09b6 openh323-1.13.2.tar.gz 2197100
diff --git a/net-libs/openh323/files/openh323-1.13.2-ffmpeg.diff b/net-libs/openh323/files/openh323-1.13.2-ffmpeg.diff
new file mode 100644
index 000000000000..e93db8302b7a
--- /dev/null
+++ b/net-libs/openh323/files/openh323-1.13.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.13.2-include-order.diff b/net-libs/openh323/files/openh323-1.13.2-include-order.diff
new file mode 100644
index 000000000000..8ca6b7c3337c
--- /dev/null
+++ b/net-libs/openh323/files/openh323-1.13.2-include-order.diff
@@ -0,0 +1,42 @@
+--- openh323u.mak.in.orig	2004-03-05 21:21:37.804902816 +0100
++++ openh323u.mak.in	2004-03-05 21:25:43.476555048 +0100
+@@ -139,7 +139,6 @@
+ 
+ PWLIBDIR	= @PWLIBDIR@
+ OPENH323DIR	= @OPENH323DIR@
+-STDCCFLAGS	+= @STDCCFLAGS@
+ LDFLAGS		+= @LDFLAGS@
+ ENDLDLIBS	:= @ENDLDLIBS@ $(ENDLDLIBS)
+ 
+@@ -160,6 +159,13 @@
+ 
+ #OH323_SUPPRESS_H235	= 1
+ 
++#
++# stkn@gentoo.org
++# oops i did it again :)
++# moved STDCCFLAGS a little bit around
++# this fixes include order problems
++# (use build dir includes before system includes...)
++#
+ OH323_SRCDIR = $(OPENH323DIR)/src
+ ifdef PREFIX
+ OH323_INCDIR = $(PREFIX)/include/openh323
+@@ -168,6 +174,8 @@
+ endif
+ OH323_LIBDIR = $(OPENH323DIR)/lib
+ 
++STDCCFLAGS	+= -I$(OH323_INCDIR) @STDCCFLAGS@
++
+ ifdef NOTRACE
+ STDCCFLAGS += -DPASN_NOPRINTON -DPASN_LEANANDMEAN
+ OH323_SUFFIX = n
+@@ -191,8 +199,6 @@
+ LDFLAGS	    += -L$(OH323_LIBDIR)
+ LDLIBS	    := -l$(OH323_BASE) $(LDLIBS)
+ 
+-STDCCFLAGS  += -I$(OH323_INCDIR)
+-
+ #ifndef NO_SPEEX
+ ifeq ($(H323_SYSTEM_SPEEX),1)
+ ENDLDLIBS    := -lspeex $(ENDLDLIBS) 
diff --git a/net-libs/openh323/openh323-1.11.7.ebuild b/net-libs/openh323/openh323-1.11.7.ebuild
index 7602f3f4bbd1..0c578bcca2eb 100644
--- a/net-libs/openh323/openh323-1.11.7.ebuild
+++ b/net-libs/openh323/openh323-1.11.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.11.7.ebuild,v 1.7 2003/09/06 22:04:23 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.11.7.ebuild,v 1.8 2004/03/09 02:06:52 stkn Exp $
 
 IUSE="ssl"
 
diff --git a/net-libs/openh323/openh323-1.12.0-r1.ebuild b/net-libs/openh323/openh323-1.12.0-r1.ebuild
index 5b7bb9906727..8667d1233cdb 100644
--- a/net-libs/openh323/openh323-1.12.0-r1.ebuild
+++ b/net-libs/openh323/openh323-1.12.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.0-r1.ebuild,v 1.6 2003/11/03 05:49:32 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.0-r1.ebuild,v 1.7 2004/03/09 02:06:52 stkn Exp $
 
 inherit eutils
 
diff --git a/net-libs/openh323/openh323-1.12.2-r1.ebuild b/net-libs/openh323/openh323-1.12.2-r1.ebuild
index 84abe8f7fcc0..4fbdf0f0efc0 100644
--- a/net-libs/openh323/openh323-1.12.2-r1.ebuild
+++ b/net-libs/openh323/openh323-1.12.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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-r1.ebuild,v 1.1 2003/10/13 21:44:16 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.12.2-r1.ebuild,v 1.2 2004/03/09 02:06:52 stkn Exp $
 
 IUSE="ssl"
 
diff --git a/net-libs/openh323/openh323-1.13.2.ebuild b/net-libs/openh323/openh323-1.13.2.ebuild
new file mode 100644
index 000000000000..c250440a3225
--- /dev/null
+++ b/net-libs/openh323/openh323-1.13.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.2.ebuild,v 1.1 2004/03/09 02:06:52 stkn Exp $
+
+IUSE="ssl"
+
+inherit eutils
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
+HOMEPAGE="http://www.openh323.org/"
+SRC_URI="http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-1.1"
+KEYWORDS="~x86"
+
+DEPEND=">=sys-apps/sed-4
+	>=dev-libs/pwlib-1.6.3
+	>=media-video/ffmpeg-0.4.7
+	>=media-libs/speex-1.0.0
+	ssl? ( dev-libs/openssl )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_setup() {
+	# to prevent merge problems with broken makefiles from old
+	# pwlib versions, we double-check here.
+
+	if [ "` fgrep '\$(OPENSSLDIR)/include' /usr/share/pwlib/make/unix.mak`" ]
+	then
+		# patch unix.mak so it doesn't require annoying
+		# unmerge/merge cycle to upgrade
+		einfo "Fixing broken pwlib makefile."
+		cd /usr/share/pwlib/make
+		sed -i \
+		-e "s:-DP_SSL -I\$(OPENSSLDIR)/include -I\$(OPENSSLDIR)/crypto:-DP_SSL:" \
+		-e "s:^LDFLAGS.*\+= -L\$(OPENSSLDIR)/lib -L\$(OPENSSLDIR):LDFLAGS +=:" \
+		unix.mak
+	fi
+
+	if has_version ">=sys-devel/gcc-3.3.2"; then
+		ewarn "If you are experiencing problems emerging openh323 with gcc-3.3.2"
+		ewarn "please try using CFLAGS=\"-O1\" when emergeing"
+		ewarn "we are currently investigating this problem..."
+		ewarn ""
+		ewarn "<sleeping 10 seconds...>"
+		sleep 10
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	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() {
+	local makeopts
+
+	export PWLIBDIR=/usr/share/pwlib
+	export PTLIB_CONFIG=/usr/bin/ptlib-config
+	export OPENH323DIR=${S}
+
+	# NOTRACE avoid compilation problems, we disable PTRACING using NOTRACE=1
+	makeopts="${makeopts} ASNPARSER=/usr/bin/asnparser LDFLAGS=-L${S}/lib NOTRACE=1"
+
+	if [ -n "`use ssl`" ]; then
+		export OPENSSLFLAG=1
+		export OPENSSLDIR=/usr
+		export OPENSSLLIBS="-lssl -lcrypt"
+	fi
+
+	econf || die
+	emake ${makeopts} opt || die "make failed"
+}
+
+src_install() {
+	local OPENH323_ARCH ALT_ARCH
+	# make NOTRACE=1 opt ==> linux_$ARCH_n
+	# make opt           ==> linux_$ARCH_r
+	OPENH323_ARCH="linux_${ARCH}_n"
+
+	dodir /usr/bin /usr/lib/ /usr/share
+	make PREFIX=${D}/usr install || die "install failed"
+	dobin ${S}/samples/simple/obj_${OPENH323_ARCH}/simph323
+
+	# remove CVS stuff (not needed, we don't copy things to
+	# /usr/share/openh323 anymore...)
+	#find ${D} -name 'CVS' -type d | xargs rm -rf
+
+	# 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
+
+	rm ${D}/usr/lib/libopenh323.so
+	dosym /usr/lib/libh323_${OPENH323_ARCH}.so.${PV} /usr/lib/libopenh323.so
+
+	# for backwards compatibility with _r versioned libraries
+	# (this might not work...)
+	ALT_ARCH=${OPENH323_ARCH/_n/_r}
+	for pv in ${PV} ${PV%.[0-9]} ${PV%.[0-9]*.[0-9]}; do
+		einfo "creating /usr/lib/libh323_${ALT_ARCH}.so.${pv} symlink"
+		dosym /usr/lib/libh323_${OPENH323_ARCH}.so.${PV} /usr/lib/libh323_${ALT_ARCH}.so.${pv}
+	done
+	dosym /usr/lib/libh323_${OPENH323_ARCH}.so.${PV} /usr/lib/libh323_${ALT_ARCH}.so
+
+	# these should point to the right directories,
+	# openh323.org apps and others 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
+}
diff --git a/net-libs/openh323/openh323-1.9.10-r1.ebuild b/net-libs/openh323/openh323-1.9.10-r1.ebuild
index 8d8aa7ac3b97..9e9f2805c517 100644
--- a/net-libs/openh323/openh323-1.9.10-r1.ebuild
+++ b/net-libs/openh323/openh323-1.9.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.9.10-r1.ebuild,v 1.10 2003/11/09 23:45:22 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.9.10-r1.ebuild,v 1.11 2004/03/09 02:06:52 stkn Exp $
 
 IUSE="ssl"