SOURCES: openh323-system-libs.patch, openh323-mak_files.patch, ope...

arekm arekm at pld-linux.org
Thu Apr 13 00:36:35 CEST 2006 

Author: arekm                        Date: Wed Apr 12 22:36:35 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   openh323-system-libs.patch (1.5 -> 1.6) , openh323-mak_files.patch (1.18 -> 1.19) , openh323-install64.patch (1.1 -> 1.2) , openh323-asnparser.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/openh323-system-libs.patch
diff -u SOURCES/openh323-system-libs.patch:1.5 SOURCES/openh323-system-libs.patch:1.6
--- SOURCES/openh323-system-libs.patch:1.5	Sat Mar 26 18:02:18 2005
+++ SOURCES/openh323-system-libs.patch	Thu Apr 13 00:36:30 2006
@@ -1,7 +1,8 @@
---- openh323-1.15.3/plugins/audio/GSM0610/gsm06_10_codec.c.orig	2005-02-07 01:41:31.000000000 +0100
-+++ openh323-1.15.3/plugins/audio/GSM0610/gsm06_10_codec.c	2005-03-25 22:21:12.020016968 +0100
-@@ -76,7 +76,7 @@
- #include <stdlib.h>
+diff -urN openh323_v1_18_0.org/plugins/audio/GSM0610/gsm06_10_codec.c openh323_v1_18_0/plugins/audio/GSM0610/gsm06_10_codec.c
+--- openh323_v1_18_0.org/plugins/audio/GSM0610/gsm06_10_codec.c	2005-07-15 12:08:59.000000000 +0200
++++ openh323_v1_18_0/plugins/audio/GSM0610/gsm06_10_codec.c	2006-04-13 00:33:28.879793500 +0200
+@@ -79,7 +79,7 @@
+ #endif
  #include <string.h>
  
 -#include "inc/gsm.h"
@@ -9,18 +10,19 @@
  
  #define	BITS_PER_SECOND         13200
  
---- openh323-1.15.3/plugins/audio/GSM0610/Makefile.in.orig	2004-08-24 16:15:12.000000000 +0200
-+++ openh323-1.15.3/plugins/audio/GSM0610/Makefile.in	2005-03-25 22:22:39.295749040 +0100
-@@ -60,7 +60,7 @@
+diff -urN openh323_v1_18_0.org/plugins/audio/GSM0610/Makefile.in openh323_v1_18_0/plugins/audio/GSM0610/Makefile.in
+--- openh323_v1_18_0.org/plugins/audio/GSM0610/Makefile.in	2006-02-20 09:55:03.000000000 +0100
++++ openh323_v1_18_0/plugins/audio/GSM0610/Makefile.in	2006-04-13 00:33:57.113558000 +0200
+@@ -63,7 +63,7 @@
  PREFIX=@INSTALLPREFIX@
  exec_prefix = ${PREFIX}
  LIBDIR=@LIBDIR@
--#H323_SYSTEM_GSM=@H323_SYSTEM_GSM@
+-H323_SYSTEM_GSM=@H323_SYSTEM_GSM@
 +H323_SYSTEM_GSM=1
  H323_EMBEDDED_GSM=@H323_EMBEDDED_GSM@
  
  CC=@CC@
-@@ -79,7 +79,7 @@
+@@ -82,7 +82,7 @@
  
  SRCS	+= gsm06_10_codec.c
  
@@ -29,7 +31,7 @@
  
  SRCS	+= $(SRCDIR)/gsm_create.c \
             $(SRCDIR)/gsm_destroy.c \
-@@ -98,11 +98,11 @@
+@@ -101,11 +101,11 @@
  
  EXTRALIBS = 
  
@@ -46,10 +48,11 @@
  
  vpath	%.o $(OBJDIR)
  vpath	%.c $(SRCDIR)
---- openh323-1.15.3/plugins/audio/LPC_10/lpc_10_codec.c.orig	2005-02-07 01:41:32.000000000 +0100
-+++ openh323-1.15.3/plugins/audio/LPC_10/lpc_10_codec.c	2005-03-25 22:21:27.805617192 +0100
-@@ -41,7 +41,7 @@
- #include <stdlib.h>
+diff -urN openh323_v1_18_0.org/plugins/audio/LPC_10/lpc_10_codec.c openh323_v1_18_0/plugins/audio/LPC_10/lpc_10_codec.c
+--- openh323_v1_18_0.org/plugins/audio/LPC_10/lpc_10_codec.c	2005-07-15 12:09:00.000000000 +0200
++++ openh323_v1_18_0/plugins/audio/LPC_10/lpc_10_codec.c	2006-04-13 00:33:28.883793750 +0200
+@@ -44,7 +44,7 @@
+ #endif
  #include <string.h>
  
 -#include "lpc10.h"
@@ -57,8 +60,9 @@
  
  PLUGIN_CODEC_IMPLEMENT("LPC 10")
  
---- openh323-1.15.3/plugins/audio/LPC_10/Makefile.in.orig	2004-08-22 06:20:19.000000000 +0200
-+++ openh323-1.15.3/plugins/audio/LPC_10/Makefile.in	2005-03-25 22:23:44.907774496 +0100
+diff -urN openh323_v1_18_0.org/plugins/audio/LPC_10/Makefile.in openh323_v1_18_0/plugins/audio/LPC_10/Makefile.in
+--- openh323_v1_18_0.org/plugins/audio/LPC_10/Makefile.in	2004-08-22 06:20:19.000000000 +0200
++++ openh323_v1_18_0/plugins/audio/LPC_10/Makefile.in	2006-04-13 00:33:28.883793750 +0200
 @@ -52,41 +52,8 @@
  
  HEADER_FILES	+= $(LPC10_INCDIR)/lpc10.h
@@ -103,10 +107,11 @@
  
  vpath	%.o $(OBJDIR)
  vpath	%.c $(SRCDIR)
---- openh323-1.15.3/plugins/audio/Speex/speexcodec.cxx.orig	2005-02-07 01:41:32.000000000 +0100
-+++ openh323-1.15.3/plugins/audio/Speex/speexcodec.cxx	2005-03-25 22:24:08.087250680 +0100
-@@ -82,7 +82,7 @@
- #include <stdlib.h>
+diff -urN openh323_v1_18_0.org/plugins/audio/Speex/speexcodec.cxx openh323_v1_18_0/plugins/audio/Speex/speexcodec.cxx
+--- openh323_v1_18_0.org/plugins/audio/Speex/speexcodec.cxx	2005-08-15 03:57:13.000000000 +0200
++++ openh323_v1_18_0/plugins/audio/Speex/speexcodec.cxx	2006-04-13 00:33:28.883793750 +0200
+@@ -88,7 +88,7 @@
+ #endif
  #include <string.h>
  
 -#include "libspeex/speex.h" 
@@ -114,3 +119,4 @@
  
  #define NARROW_SAMPLES_PER_FRAME       160
  #define WIDE_SAMPLES_PER_FRAME         320
+

================================================================
Index: SOURCES/openh323-mak_files.patch
diff -u SOURCES/openh323-mak_files.patch:1.18 SOURCES/openh323-mak_files.patch:1.19
--- SOURCES/openh323-mak_files.patch:1.18	Wed May 18 19:54:51 2005
+++ SOURCES/openh323-mak_files.patch	Thu Apr 13 00:36:30 2006
@@ -1,7 +1,7 @@
-diff -Naur openh323_v1_17_1.orig/configure.ac openh323_v1_17_1/configure.ac
---- openh323_v1_17_1.orig/configure.ac	2005-05-18 18:27:25.000000000 +0200
-+++ openh323_v1_17_1/configure.ac	2005-05-18 18:27:18.000000000 +0200
-@@ -75,13 +75,6 @@
+diff -urN openh323_v1_18_0.org/configure.ac openh323_v1_18_0/configure.ac
+--- openh323_v1_18_0.org/configure.ac	2005-08-30 03:12:38.000000000 +0200
++++ openh323_v1_18_0/configure.ac	2006-04-13 00:27:51.794727000 +0200
+@@ -91,13 +91,6 @@
    PWLIBDIR=`$PTLIB_CONFIG --prefix`
  fi
  
@@ -15,32 +15,44 @@
  echo "PWLib prefix set to.... $PWLIBDIR"
  
  AC_SUBST(PWLIBDIR)
-diff -Naur openh323_v1_17_1.orig/Makefile.in openh323_v1_17_1/Makefile.in
---- openh323_v1_17_1.orig/Makefile.in	2004-11-27 19:42:15.000000000 +0100
-+++ openh323_v1_17_1/Makefile.in	2005-05-18 18:27:18.000000000 +0200
-@@ -331,15 +331,13 @@
+diff -urN openh323_v1_18_0.org/Makefile.in openh323_v1_18_0/Makefile.in
+--- openh323_v1_18_0.org/Makefile.in	2005-08-04 21:31:59.000000000 +0200
++++ openh323_v1_18_0/Makefile.in	2006-04-13 00:29:52.258255500 +0200
+@@ -336,24 +336,13 @@
  
  install:
  	mkdir -p $(DESTDIR)$(LIBDIR)
 -	rm -f $(DESTDIR)$(LIBDIR)/libh323_*_r.so*
--	$(INSTALL) -m 444 lib/*_r.so $(DESTDIR)$(LIBDIR)
--	(for fn in lib/*_r.so.* ; do \
-+	rm -f $(DESTDIR)$(LIBDIR)/libopenh323*.so*
+-	$(INSTALL) -m 444 lib/$(OH323_FILE). at MAJOR_VERSION@. at MINOR_VERSION@. at BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
+-	(cd $(DESTDIR)$(LIBDIR) ; \
+-		rm -f  $(OH323_FILE). at MAJOR_VERSION@. at MINOR_VERSION@ ; \
+-		ln -sf $(OH323_FILE). at MAJOR_VERSION@. at MINOR_VERSION@. at BUILD_NUMBER@ $(OH323_FILE). at MAJOR_VERSION@. at MINOR_VERSION@ \
+-	)
+-	(cd $(DESTDIR)$(LIBDIR) ; \
+-		rm -f  $(OH323_FILE). at MAJOR_VERSION@ ; \
+-		ln -sf $(OH323_FILE). at MAJOR_VERSION@. at MINOR_VERSION@. at BUILD_NUMBER@ $(OH323_FILE). at MAJOR_VERSION@ \
+-	)
+-	(cd $(DESTDIR)$(LIBDIR) ; \
+-		rm -f  $(OH323_FILE) ; \
+-		ln -sf $(OH323_FILE). at MAJOR_VERSION@. at MINOR_VERSION@. at BUILD_NUMBER@ $(OH323_FILE) \
+-	)
+-	(cd $(DESTDIR)$(LIBDIR); \
+-		rm -f  libopenh323. at SHAREDLIBEXT@ ; \
+-		ln -sf $(OH323_FILE) libopenh323. at SHAREDLIBEXT@ \
+-	)
++	rm -f $(DESTDIR)$(LIBDIR)/libh323*.so*
 +	$(INSTALL) lib/*.so.*.*.* $(DESTDIR)$(LIBDIR)
 +	(for fn in lib/*.so ; do \
- 		cd $(DESTDIR)$(LIBDIR) ; \
- 		rm -f `basename $$fn` ; \
--		ln -s libh323_*_r.so `basename $$fn` ; \
++		cd $(DESTDIR)$(LIBDIR) ; \
++		rm -f `basename $$fn` ; \
 +		ln -s libopenh323.so.*.*.* `basename $$fn` ; \
- 	done)
--	$(INSTALL) -m 444 lib/$(OH323_FILE) $(DESTDIR)$(LIBDIR)
--	( cd $(DESTDIR)$(LIBDIR); rm libopenh323.so ; ln -s $(OH323_FILE) libopenh323.so)
++	done)
  	( for dir in $(DESTDIR)$(LIBDIR) \
  		     $(DESTDIR)$(PREFIX)/include/openh323 \
  		     $(DESTDIR)$(PREFIX)/share/openh323 ;\
-diff -Naur openh323_v1_17_1.orig/openh323u.mak.in openh323_v1_17_1/openh323u.mak.in
---- openh323_v1_17_1.orig/openh323u.mak.in	2005-05-18 18:27:25.000000000 +0200
-+++ openh323_v1_17_1/openh323u.mak.in	2005-05-18 18:27:18.000000000 +0200
+diff -urN openh323_v1_18_0.org/openh323u.mak.in openh323_v1_18_0/openh323u.mak.in
+--- openh323_v1_18_0.org/openh323u.mak.in	2005-01-03 07:25:51.000000000 +0100
++++ openh323_v1_18_0/openh323u.mak.in	2006-04-13 00:27:51.798727250 +0200
 @@ -163,9 +163,11 @@
  #
  
@@ -87,7 +99,7 @@
 +OH323_BASE  = openh323
  OH323_FILE  = lib$(OH323_BASE).$(LIB_SUFFIX)
  
- LDFLAGS	    := -L$(OH323_LIBDIR) $(LDFLAGS)
+ LDFLAGS	    += -L$(OH323_LIBDIR)
 @@ -271,6 +273,7 @@
  
  $(TARGET) :	$(OH323_LIBDIR)/$(OH323_FILE)
@@ -104,10 +116,10 @@
  
  # End of file
  
-diff -Naur openh323_v1_17_1.orig/src/Makefile openh323_v1_17_1/src/Makefile
---- openh323_v1_17_1.orig/src/Makefile	2005-05-18 18:27:25.000000000 +0200
-+++ openh323_v1_17_1/src/Makefile	2005-05-18 18:27:18.000000000 +0200
-@@ -376,7 +376,7 @@
+diff -urN openh323_v1_18_0.org/src/Makefile openh323_v1_18_0/src/Makefile
+--- openh323_v1_18_0.org/src/Makefile	2005-06-07 09:59:11.000000000 +0200
++++ openh323_v1_18_0/src/Makefile	2006-04-13 00:27:51.798727250 +0200
+@@ -379,7 +379,7 @@
  
  ####################################################
  
@@ -116,7 +128,7 @@
  
  ####################################################
  
-@@ -388,7 +388,7 @@
+@@ -391,7 +391,7 @@
  LIB_BASENAME=$(OH323_BASE)
  LIB_FILENAME=$(OH323_FILE)
  
@@ -125,3 +137,4 @@
  
  ####################################################
  
+

================================================================
Index: SOURCES/openh323-install64.patch
diff -u SOURCES/openh323-install64.patch:1.1 SOURCES/openh323-install64.patch:1.2
--- SOURCES/openh323-install64.patch:1.1	Sat Jun  4 23:17:05 2005
+++ SOURCES/openh323-install64.patch	Thu Apr 13 00:36:30 2006
@@ -1,9 +1,10 @@
---- openh323_v1_17_1/Makefile.in.orig	2005-06-04 20:57:08.000000000 +0000
-+++ openh323_v1_17_1/Makefile.in	2005-06-04 21:12:22.993021136 +0000
-@@ -332,8 +332,8 @@
+diff -urN openh323_v1_18_0.org/Makefile.in openh323_v1_18_0/Makefile.in
+--- openh323_v1_18_0.org/Makefile.in	2006-04-13 00:35:48.044490750 +0200
++++ openh323_v1_18_0/Makefile.in	2006-04-13 00:36:29.723095500 +0200
+@@ -337,8 +337,8 @@
  install:
  	mkdir -p $(DESTDIR)$(LIBDIR)
- 	rm -f $(DESTDIR)$(LIBDIR)/libopenh323*.so*
+ 	rm -f $(DESTDIR)$(LIBDIR)/libh323*.so*
 -	$(INSTALL) lib/*.so.*.*.* $(DESTDIR)$(LIBDIR)
 -	(for fn in lib/*.so ; do \
 +	$(INSTALL) lib64/*.so.*.*.* $(DESTDIR)$(LIBDIR)

================================================================
Index: SOURCES/openh323-asnparser.patch
diff -u SOURCES/openh323-asnparser.patch:1.3 SOURCES/openh323-asnparser.patch:1.4
--- SOURCES/openh323-asnparser.patch:1.3	Tue Jan  8 14:00:16 2002
+++ SOURCES/openh323-asnparser.patch	Thu Apr 13 00:36:30 2006
@@ -1,11 +1,11 @@
-diff -urN openh323.org/src/Makefile openh323/src/Makefile
---- openh323.org/src/Makefile	Tue Jan  8 00:59:12 2002
-+++ openh323/src/Makefile	Tue Jan  8 01:03:10 2002
-@@ -538,7 +538,7 @@
+diff -urN openh323_v1_18_0.org/src/Makefile openh323_v1_18_0/src/Makefile
+--- openh323_v1_18_0.org/src/Makefile	2005-06-07 09:59:11.000000000 +0200
++++ openh323_v1_18_0/src/Makefile	2006-04-13 00:32:11.946985500 +0200
+@@ -421,7 +421,7 @@
  # If we're cross compiling, we want the host's asnparser
  # otherwise use the one for the current platform
  ASNPARSE_DIR = $(HOSTPWLIBDIR)/tools/asnparser
--ASNPARSER = $(ASNPARSE_DIR)/obj_$(HOST_PLATFORM_TYPE)_r/asnparser
+-ASNPARSER = $(ASNPARSE_DIR)/obj_$(HOST_PLATFORM_TYPE)_d/asnparser
 +ASNPARSER = $(PWLIBDIR)/bin/asnparser
  
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/openh323-system-libs.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SOURCES/openh323-mak_files.patch?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SOURCES/openh323-install64.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/openh323-asnparser.patch?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list