new version, copyright header updates

3 files changed, 95 insertions, 0 deletions

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)