Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 129406 Details for
Bug 188056
New ebuild: pjsip-0.5.10.4.ebuild
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
pjsip-0.5.10.4-saneMake.diff
pjsip-0.5.10.4-saneMake.diff (text/plain), 13.59 KB, created by
Angelo Arrifano (RETIRED)
on 2007-08-28 04:42:05 UTC
(
hide
)
Description:
pjsip-0.5.10.4-saneMake.diff
Filename:
MIME Type:
Creator:
Angelo Arrifano (RETIRED)
Created:
2007-08-28 04:42:05 UTC
Size:
13.59 KB
patch
obsolete
>diff -urp pjproject-0.5.10.4/Makefile pjproject-0.5.10.4-new/Makefile >--- pjproject-0.5.10.4/Makefile 2007-04-15 11:56:39.000000000 +0100 >+++ pjproject-0.5.10.4-new/Makefile 2007-08-28 05:02:59.473870768 +0100 >@@ -18,15 +18,15 @@ all clean dep depend distclean doc print > fi; \ > done > >-LIBS = pjlib/lib/libpj-$(TARGET_NAME).a \ >- pjlib-util/lib/libpjlib-util-$(TARGET_NAME).a \ >- pjmedia/lib/libpjmedia-$(TARGET_NAME).a \ >- pjmedia/lib/libpjmedia-codec-$(TARGET_NAME).a \ >- pjsip/lib/libpjsip-$(TARGET_NAME).a \ >- pjsip/lib/libpjsip-ua-$(TARGET_NAME).a \ >- pjsip/lib/libpjsip-simple-$(TARGET_NAME).a \ >- pjsip/lib/libpjsua-$(TARGET_NAME).a >-BINS = pjsip-apps/bin/pjsua-$(TARGET_NAME)$(HOST_EXE) >+LIBS = pjlib/lib/libpj.a \ >+ pjlib-util/lib/libpjlib-util.a \ >+ pjmedia/lib/libpjmedia.a \ >+ pjmedia/lib/libpjmedia-codec.a \ >+ pjsip/lib/libpjsip.a \ >+ pjsip/lib/libpjsip-ua.a \ >+ pjsip/lib/libpjsip-simple.a \ >+ pjsip/lib/libpjsua.a >+BINS = pjsip-apps/bin/pjsua$(HOST_EXE) > > size: > @echo -n 'Date: ' >@@ -57,14 +57,11 @@ xhdrid: > cp /tmp/id $$f; \ > done > >-prefix = /usr/local >+prefix = $(PREFIX) > install: > mkdir -p $(DESTDIR)$(prefix)/lib > cp -L $$(find . -name '*.a') $(DESTDIR)$(prefix)/lib > mkdir -p $(DESTDIR)$(prefix)/include > cp -RL $$(find . -name include) $(DESTDIR)$(prefix) >- cd $(DESTDIR)$(prefix)/lib && for i in $$(find . -name 'libpj*a'); do\ >- ln -s $$i $$(echo $$i | sed -e "s/-$(TARGET_NAME)//");\ >- done > mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig > sed -e "s!@PREFIX@!$(DESTDIR)$(prefix)!" libpj.pc.in > $(DESTDIR)/$(prefix)/lib/pkgconfig/libpj.pc >diff -urp pjproject-0.5.10.4/build.mak.in pjproject-0.5.10.4-new/build.mak.in >--- pjproject-0.5.10.4/build.mak.in 2007-03-12 20:37:40.000000000 +0000 >+++ pjproject-0.5.10.4-new/build.mak.in 2007-08-28 05:03:16.092728592 +0100 >@@ -6,6 +6,7 @@ export CC_NAME := gcc > export TARGET_NAME := @target@ > export CROSS_COMPILE := @ac_cross_compile@ > export LINUX_POLL := @ac_linux_poll@ >+export PREFIX := @prefix@ > > # Application can use this > export PJDIR := @ac_pjdir@ >diff -urp pjproject-0.5.10.4/pjlib/build/Makefile pjproject-0.5.10.4-new/pjlib/build/Makefile >--- pjproject-0.5.10.4/pjlib/build/Makefile 2006-09-17 20:54:23.000000000 +0100 >+++ pjproject-0.5.10.4-new/pjlib/build/Makefile 2007-08-28 04:58:43.000000000 +0100 >@@ -3,7 +3,7 @@ include ../../build/common.mak > RULES_MAK := ../../build/rules.mak > > >-export PJLIB_LIB := ../lib/libpj-$(TARGET_NAME)$(LIBEXT) >+export PJLIB_LIB := ../lib/libpj$(LIBEXT) > > ############################################################################### > # Gather all flags. >@@ -26,7 +26,7 @@ export PJLIB_OBJS += $(OS_OBJS) $(M_OBJS > pool.o pool_buf.o pool_caching.o pool_dbg.o rand.o \ > rbtree.o string.o timer.o \ > types.o symbols.o >-export PJLIB_CFLAGS += $(_CFLAGS) >+export PJLIB_CFLAGS += $(_CFLAGS) -fPIC > > ############################################################################### > # Defines for building test application >@@ -42,7 +42,7 @@ export TEST_OBJS += atomic.o echo_clt.o > util.o > export TEST_CFLAGS += $(_CFLAGS) > export TEST_LDFLAGS += $(_LDFLAGS) >-export TEST_EXE := ../bin/pjlib-test-$(TARGET_NAME)$(HOST_EXE) >+export TEST_EXE := ../bin/pjlib-test-$(HOST_EXE) > > > export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT >diff -urp pjproject-0.5.10.4/pjlib-util/build/Makefile pjproject-0.5.10.4-new/pjlib-util/build/Makefile >--- pjproject-0.5.10.4/pjlib-util/build/Makefile 2006-11-17 13:44:16.000000000 +0000 >+++ pjproject-0.5.10.4-new/pjlib-util/build/Makefile 2007-08-28 04:58:43.000000000 +0100 >@@ -6,8 +6,8 @@ include ../../build/common.mak > > RULES_MAK := ../../build/rules.mak > >-PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) >-export PJLIB_UTIL_LIB:=../lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) >+PJLIB_LIB:=../../pjlib/lib/libpj$(LIBEXT) >+export PJLIB_UTIL_LIB:=../lib/libpjlib-util$(LIBEXT) > > ############################################################################### > # Gather all flags. >@@ -28,7 +28,7 @@ export PJLIB_UTIL_SRCDIR = ../src/pjlib- > export PJLIB_UTIL_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ > errno.o dns.o dns_dump.o getopt.o md5.o resolver.o \ > scanner.o stun.o string.o stun_client.o xml.o >-export PJLIB_UTIL_CFLAGS += $(_CFLAGS) >+export PJLIB_UTIL_CFLAGS += $(_CFLAGS) -fPIC > > ############################################################################### > # Defines for building test application >@@ -37,7 +37,7 @@ export UTIL_TEST_SRCDIR = ../src/pjlib-u > export UTIL_TEST_OBJS += xml.o test.o > export UTIL_TEST_CFLAGS += $(_CFLAGS) > export UTIL_TEST_LDFLAGS += $(_LDFLAGS) >-export UTIL_TEST_EXE:=../bin/pjlib-util-test-$(TARGET_NAME)$(HOST_EXE) >+export UTIL_TEST_EXE:=../bin/pjlib-util-test-$(HOST_EXE) > > > export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT >diff -urp pjproject-0.5.10.4/pjmedia/build/Makefile pjproject-0.5.10.4-new/pjmedia/build/Makefile >--- pjproject-0.5.10.4/pjmedia/build/Makefile 2007-01-21 23:12:40.000000000 +0000 >+++ pjproject-0.5.10.4-new/pjmedia/build/Makefile 2007-08-28 04:58:43.000000000 +0100 >@@ -18,12 +18,12 @@ include ../../build/common.mak > > RULES_MAK := ../../build/rules.mak > >-PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) >-PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) >+PJLIB_LIB:=../../pjlib/lib/libpj$(LIBEXT) >+PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util$(LIBEXT) > >-export PJMEDIA_LIB:=../lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) >-export PJMEDIA_CODEC_LIB:=../lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) >-export PJSDP_LIB:=../lib/libpjsdp-$(TARGET_NAME)$(LIBEXT) >+export PJMEDIA_LIB:=../lib/libpjmedia$(LIBEXT) >+export PJMEDIA_CODEC_LIB:=../lib/libpjmedia-codec$(LIBEXT) >+export PJSDP_LIB:=../lib/libpjsdp$(LIBEXT) > > ############################################################################### > # Sound frameworks >@@ -78,7 +78,7 @@ export PJMEDIA_OBJS += $(OS_OBJS) $(M_OB > wav_player.o wav_playlist.o wav_writer.o wave.o \ > $(SOUND_OBJS) $(NULLSOUND_OBJS) > >-export PJMEDIA_CFLAGS += $(_CFLAGS) >+export PJMEDIA_CFLAGS += $(_CFLAGS) -fPIC > > > ############################################################################### >@@ -90,7 +90,7 @@ export PJMEDIA_CFLAGS += $(_CFLAGS) > export PJSDP_SRCDIR = ../src/pjmedia > export PJSDP_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ > errno.o sdp.o sdp_cmp.o sdp_neg.o >-export PJSDP_CFLAGS += $(_CFLAGS) >+export PJSDP_CFLAGS += $(_CFLAGS) -fPIC > > > ############################################################################### >@@ -103,7 +103,7 @@ GSM_OBJS := gsm.o \ > gsm/gsm_option.o gsm/long_term.o \ > gsm/lpc.o gsm/preprocess.o gsm/rpe.o gsm/short_term.o \ > gsm/table.o >-GSM_CFLAGS := >+GSM_CFLAGS := > > SPEEX_OBJS := speex_codec.o \ > speex/bits.o speex/cb_search.o speex/exc_10_16_table.o \ >@@ -131,14 +131,14 @@ ILBC_OBJS := ilbc.o \ > ilbc/hpOutput.o ilbc/iCBConstruct.o ilbc/iCBSearch.o \ > ilbc/iLBC_decode.o ilbc/iLBC_encode.o ilbc/lsf.o \ > ilbc/packing.o ilbc/syntFilter.o >-ILBC_CFLAGS := >+ILBC_CFLAGS := > > export PJMEDIA_CODEC_SRCDIR = ../src/pjmedia-codec > export PJMEDIA_CODEC_OBJS += \ > $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ > $(CODEC_OBJS) > export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \ >- $(ILBC_CFLAGS) >+ $(ILBC_CFLAGS) -fPIC > > > ############################################################################### >@@ -148,7 +148,7 @@ export PJMEDIA_TEST_SRCDIR = ../src/test > export PJMEDIA_TEST_OBJS += jbuf_test.o main.o rtp_test.o sdp_neg_test.o test.o > export PJMEDIA_TEST_CFLAGS += $(_CFLAGS) > export PJMEDIA_TEST_LDFLAGS += $(_LDFLAGS) >-export PJMEDIA_TEST_EXE:=../bin/pjmedia-test-$(TARGET_NAME)$(HOST_EXE) >+export PJMEDIA_TEST_EXE:=../bin/pjmedia-test-$(HOST_EXE) > > > export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT >diff -urp pjproject-0.5.10.4/pjsip/build/Makefile pjproject-0.5.10.4-new/pjsip/build/Makefile >--- pjproject-0.5.10.4/pjsip/build/Makefile 2006-12-25 20:34:14.000000000 +0000 >+++ pjproject-0.5.10.4-new/pjsip/build/Makefile 2007-08-28 04:58:43.000000000 +0100 >@@ -7,15 +7,15 @@ include ../../build/common.mak > > RULES_MAK := ../../build/rules.mak > >-PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) >-PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) >-PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) >-PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) >- >-export PJSIP_LIB:=../lib/libpjsip-$(TARGET_NAME)$(LIBEXT) >-export PJSIP_UA_LIB:=../lib/libpjsip-ua-$(TARGET_NAME)$(LIBEXT) >-export PJSIP_SIMPLE_LIB:=../lib/libpjsip-simple-$(TARGET_NAME)$(LIBEXT) >-export PJSUA_LIB_LIB=../lib/libpjsua-$(TARGET_NAME)$(LIBEXT) >+PJLIB_LIB:=../../pjlib/lib/libpj$(LIBEXT) >+PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util$(LIBEXT) >+PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia$(LIBEXT) >+PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec$(LIBEXT) >+ >+export PJSIP_LIB:=../lib/libpjsip$(LIBEXT) >+export PJSIP_UA_LIB:=../lib/libpjsip-ua$(LIBEXT) >+export PJSIP_SIMPLE_LIB:=../lib/libpjsip-simple$(LIBEXT) >+export PJSUA_LIB_LIB=../lib/libpjsua$(LIBEXT) > > > ############################################################################### >@@ -50,7 +50,7 @@ export PJSIP_OBJS += $(OS_OBJS) $(M_OBJS > sip_auth_server.o \ > sip_transaction.o sip_util_statefull.o \ > sip_dialog.o sip_ua_layer.o >-export PJSIP_CFLAGS += $(_CFLAGS) >+export PJSIP_CFLAGS += $(_CFLAGS) -fPIC > > ############################################################################### > # Defines for building PJSIP UA library >@@ -58,7 +58,7 @@ export PJSIP_CFLAGS += $(_CFLAGS) > export PJSIP_UA_SRCDIR = ../src/pjsip-ua > export PJSIP_UA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ > sip_inv.o sip_reg.o sip_replaces.o sip_xfer.o >-export PJSIP_UA_CFLAGS += $(_CFLAGS) >+export PJSIP_UA_CFLAGS += $(_CFLAGS) -fPIC > > > ############################################################################### >@@ -69,7 +69,7 @@ export PJSIP_SIMPLE_OBJS += $(OS_OBJS) $ > errno.o evsub.o evsub_msg.o iscomposing.o \ > pidf.o presence.o presence_body.o publishc.o \ > xpidf.o >-export PJSIP_SIMPLE_CFLAGS += $(_CFLAGS) >+export PJSIP_SIMPLE_CFLAGS += $(_CFLAGS) -fPIC > > > ############################################################################### >@@ -79,7 +79,7 @@ export PJSUA_LIB_SRCDIR = ../src/pjsua-l > export PJSUA_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ > pjsua_acc.o pjsua_call.o pjsua_core.o \ > pjsua_im.o pjsua_media.o pjsua_pres.o >-export PJSUA_LIB_CFLAGS += $(_CFLAGS) >+export PJSUA_LIB_CFLAGS += $(_CFLAGS) -fPIC > > > export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT >@@ -96,7 +96,7 @@ export TEST_OBJS += dlg_core_test.o dns_ > tsx_uas_test.o txdata_test.o uri_test.o > export TEST_CFLAGS += $(_CFLAGS) > export TEST_LDFLAGS += $(_LDFLAGS) >-export TEST_EXE := ../bin/pjsip-test-$(TARGET_NAME)$(HOST_EXE) >+export TEST_EXE := ../bin/pjsip-test$(HOST_EXE) > > > export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT >diff -urp pjproject-0.5.10.4/pjsip-apps/build/Makefile pjproject-0.5.10.4-new/pjsip-apps/build/Makefile >--- pjproject-0.5.10.4/pjsip-apps/build/Makefile 2006-08-02 20:41:37.000000000 +0100 >+++ pjproject-0.5.10.4-new/pjsip-apps/build/Makefile 2007-08-28 05:10:07.734437394 +0100 >@@ -2,14 +2,14 @@ include ../../build/common.mak > > RULES_MAK := ../../build/rules.mak > >-PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) >-PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) >-PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) >-PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) >-PJSIP_LIB:=../../pjsip/lib/libpjsip-$(TARGET_NAME)$(LIBEXT) >-PJSIP_UA_LIB:=../../pjsip/lib/libpjsip-ua-$(TARGET_NAME)$(LIBEXT) >-PJSIP_SIMPLE_LIB:=../../pjsip/lib/libpjsip-simple-$(TARGET_NAME)$(LIBEXT) >-PJSUA_LIB_LIB=../../pjsip/lib/libpjsua-$(TARGET_NAME)$(LIBEXT) >+PJLIB_LIB:=../../pjlib/lib/libpj$(LIBEXT) >+PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util$(LIBEXT) >+PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia$(LIBEXT) >+PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec$(LIBEXT) >+PJSIP_LIB:=../../pjsip/lib/libpjsip$(LIBEXT) >+PJSIP_UA_LIB:=../../pjsip/lib/libpjsip-ua$(LIBEXT) >+PJSIP_SIMPLE_LIB:=../../pjsip/lib/libpjsip-simple$(LIBEXT) >+PJSUA_LIB_LIB=../../pjsip/lib/libpjsua$(LIBEXT) > > > ############################################################################### >@@ -41,7 +41,7 @@ export PJSUA_OBJS += $(OS_OBJS) $(M_OBJS > main.o pjsua_app.o > export PJSUA_CFLAGS += $(_CFLAGS) > export PJSUA_LDFLAGS += $(_LDFLAGS) >-export PJSUA_EXE:=../bin/pjsua-$(TARGET_NAME)$(HOST_EXE) >+export PJSUA_EXE:=../bin/pjsua$(HOST_EXE) > > > export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT >@@ -49,7 +49,7 @@ export CC_OUT CC AR RANLIB HOST_MV HOST_ > # Main entry > # > # >-TARGETS := pjsua samples >+TARGETS := pjsua > > .PHONY: $(TARGETS) > >--- pjproject-0.5.10.4/pjsip-apps/src/py_pjsua/setup.py 2007-02-07 10:09:19.000000000 +0000 >+++ pjproject-0.5.10.4-new/pjsip-apps/src/py_pjsua/setup.py 2007-08-28 05:20:37.216399054 +0100 >@@ -29,15 +29,15 @@ setup(name="py_pjsua", version="0.1", > pjproject + "pjlib/lib", > pjproject + "pjmedia/lib", > pjproject + "pjlib-util/lib"], >- libraries=[ "pjsua-" + target, >- "pjsip-ua-" + target, >- "pjsip-simple-" + target, >- "pjsip-" + target, >- "pjmedia-codec-" + target, >- "pjmedia-" + target, >- "pjmedia-codec-" + target, >- "pjlib-util-" + target, >- "pj-" + target, >+ libraries=[ "pjsua", >+ "pjsip-ua", >+ "pjsip-simple", >+ "pjsip", >+ "pjmedia-codec", >+ "pjmedia", >+ "pjmedia-codec", >+ "pjlib-util", >+ "pj", > "ssl", > "crypto", > "asound"]),
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 188056
:
127212
|
127213
|
127412
|
129275
| 129406 |
129407
|
129472
|
213733
|
229309