[Pkg-voip-commits] [pjproject] 04/16: merge patched into master
tzafrir at debian.org
tzafrir at debian.org
Thu Dec 31 14:14:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to branch master-mergelibs
in repository pjproject.
commit 87eba0abe6d47a094ffa76fa7ea667b9e632d3a3
Merge: 7a69098 90ddf35
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Wed Dec 30 08:35:43 2015 +0200
merge patched into master
build.mak.in | 2 -
debian/.git-dpm | 4 +-
...ss-lpathon2.7-explicitly-to-python-module.patch | 26 ++++++
...e-link-order-for-building-with-as-needed.patch} | 82 +++--------------
...erge-pjmedia-audio-video-dev-into-pjmedia.patch | 101 +++++++++++++++++++++
debian/patches/series | 4 +-
pjmedia/build/Makefile | 5 +-
7 files changed, 146 insertions(+), 78 deletions(-)
diff --cc debian/.git-dpm
index e0f6e72,0000000..4cd1caa
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 178f02749cdc4752a759dd46623fbad182e5faed
- 178f02749cdc4752a759dd46623fbad182e5faed
++90ddf35f990a14602ae0325e55a9c6ad77646a26
++90ddf35f990a14602ae0325e55a9c6ad77646a26
+8bc494943161dfa21ff5d95e9ec78efd4f35e408
+8bc494943161dfa21ff5d95e9ec78efd4f35e408
+pjproject_2.4.5~dfsg.orig.tar.bz2
+be4b2b7739c3d02d6265a4cc2ca0661df38dd151
+4449242
diff --cc debian/patches/0004-Pass-lpathon2.7-explicitly-to-python-module.patch
index 0000000,0000000..dbfba07
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Pass-lpathon2.7-explicitly-to-python-module.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 2ab2d5ad99edbed21a997659512ff53e99596517 Mon Sep 17 00:00:00 2001
++From: Tzafrir Cohen <tzafrir at debian.org>
++Date: Wed, 30 Dec 2015 06:36:59 +0200
++Subject: Pass -lpathon2.7 explicitly to python module
++
++Preparation for building with --as-needed.
++
++FIXME: this is probably the wrong way to do it, and also fails with
++python3.
++---
++ pjsip-apps/src/python/setup.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/pjsip-apps/src/python/setup.py b/pjsip-apps/src/python/setup.py
++index 9eaed9d..8855fe5 100644
++--- a/pjsip-apps/src/python/setup.py
+++++ b/pjsip-apps/src/python/setup.py
++@@ -92,7 +92,7 @@ if platform.system() == 'Darwin':
++ if version[0] == '10' and int(version[1]) >= 7:
++ extra_link_args += ["-framework", "AudioUnit"]
++ else:
++- extra_link_args = []
+++ extra_link_args = ['-lpython2.7']
++
++
++ setup(name="pjsua",
diff --cc debian/patches/0005-Rearange-link-order-for-building-with-as-needed.patch
index d375cab,0000000..70c41fc
mode 100644,000000..100644
--- a/debian/patches/0005-Rearange-link-order-for-building-with-as-needed.patch
+++ b/debian/patches/0005-Rearange-link-order-for-building-with-as-needed.patch
@@@ -1,201 -1,0 +1,143 @@@
- From 178f02749cdc4752a759dd46623fbad182e5faed Mon Sep 17 00:00:00 2001
++From cbbc2eda9731dccdda3e83f5fbc6d50e4e52eb27 Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <tzafrir at debian.org>
- Date: Sat, 5 Dec 2015 13:24:25 +0200
- Subject: fix link order (WIP)
++Date: Wed, 30 Dec 2015 06:39:48 +0200
++Subject: Rearange link order for building with --as-needed
+
- * Fix linking with --as-needed. Requires changing the link order to
- place libs after library paths.
- * Fix the linking order in pjmedia: audiodev and videodev depend on the
- main pjmedia library and not vice versa.
+---
- build/os-auto.mak.in | 3 ++-
- pjlib-util/build/Makefile | 4 ++--
- pjlib/build/Makefile | 4 ++--
- pjmedia/build/Makefile | 12 +++++++-----
- pjnath/build/Makefile | 4 ++--
- pjsip-apps/build/Makefile | 4 ++--
- pjsip-apps/src/python/setup.py | 2 +-
- pjsip/build/Makefile | 13 ++++++++-----
- 8 files changed, 26 insertions(+), 20 deletions(-)
++ build/os-auto.mak.in | 3 ++-
++ pjlib-util/build/Makefile | 4 ++--
++ pjlib/build/Makefile | 4 ++--
++ pjmedia/build/Makefile | 4 ++--
++ pjnath/build/Makefile | 4 ++--
++ pjsip-apps/build/Makefile | 4 ++--
++ pjsip/build/Makefile | 13 ++++++++-----
++ 7 files changed, 20 insertions(+), 16 deletions(-)
+
+diff --git a/build/os-auto.mak.in b/build/os-auto.mak.in
+index 3d99927..84d835c 100644
+--- a/build/os-auto.mak.in
++++ b/build/os-auto.mak.in
+@@ -4,7 +4,8 @@ export OS_CFLAGS := $(CC_DEF)PJ_AUTOCONF=1 @CFLAGS@
+
+ export OS_CXXFLAGS := $(CC_DEF)PJ_AUTOCONF=1 @CXXFLAGS@
+
+-export OS_LDFLAGS := @LDFLAGS@ @LIBS@
++export OS_LDFLAGS := @LDFLAGS@
++export OS_LIBS := @LIBS@
+
+ export OS_SOURCES :=
+
+diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile
+index cb601cb..08c8e14 100644
+--- a/pjlib-util/build/Makefile
++++ b/pjlib-util/build/Makefile
+@@ -28,8 +28,8 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+ $(CFLAGS) $(CC_INC)../include $(CC_INC)../../pjlib/include
+ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+ $(HOST_CXXFLAGS) $(CXXFLAGS)
+-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+- $(APP_LDFLAGS) $(LDFLAGS)
++export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(APP_LDFLAGS) $(M_LDFLAGS) \
++ $(HOST_LDFLAGS) $(LDFLAGS)
+
+ ###############################################################################
+ # Defines for building PJLIB-UTIL library
+diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile
+index 1e64950..3d8a663 100644
+--- a/pjlib/build/Makefile
++++ b/pjlib/build/Makefile
+@@ -22,8 +22,8 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+ $(CFLAGS) $(CC_INC)../include
+ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+ $(HOST_CXXFLAGS) $(CXXFLAGS)
+-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+- $(APP_LDFLAGS) $(LDFLAGS)
++export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(OS_LIBS) $(APP_LDFLAGS) \
++ $(M_LDFLAGS) $(HOST_LDFLAGS) $(LDFLAGS)
+
+
+ ###############################################################################
+diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
- index 702efdc..f95fc2d 100644
++index 702efdc..9578a1f 100644
+--- a/pjmedia/build/Makefile
++++ b/pjmedia/build/Makefile
+@@ -50,8 +50,8 @@ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+
+ export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \
+ $(APP_THIRD_PARTY_EXT) \
+- $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+- $(APP_LDFLAGS) $(LDFLAGS)
++ $(CC_LDFLAGS) $(OS_LDFLAGS) $(OS_LIBS) $(M_LDFLAGS) \
++ $(HOST_LDFLAGS) $(APP_LDFLAGS) $(LDFLAGS)
+
+ ###############################################################################
+ # Defines for building PJMEDIA library
- @@ -98,6 +98,7 @@ export PJMEDIA_AUDIODEV_OBJS += audiodev.o audiotest.o errno.o \
- export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
- export PJMEDIA_AUDIODEV_CXXFLAGS += $(_CXXFLAGS)
- export PJMEDIA_AUDIODEV_LDFLAGS += $(PJLIB_LDLIB) \
- + $(PJMEDIA_LDLIB) \
- $(_LDFLAGS)
-
-
- @@ -111,6 +112,7 @@ export PJMEDIA_VIDEODEV_OBJS += errno.o videodev.o avi_dev.o ffmpeg_dev.o \
- export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS)
- export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS)
- export PJMEDIA_VIDEODEV_LDFLAGS += $(PJLIB_LDLIB) \
- + $(PJMEDIA_LDLIB) \
- $(_LDFLAGS)
-
-
- @@ -211,7 +213,7 @@ distclean: realclean
-
- pjmedia: $(PJMEDIA_LIB)
- $(PJMEDIA_SONAME): $(PJMEDIA_LIB)
- -$(PJMEDIA_LIB) $(PJMEDIA_SONAME): $(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME) $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME)
- +$(PJMEDIA_LIB) $(PJMEDIA_SONAME):
- $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
-
- pjmedia-codec: $(PJMEDIA_CODEC_LIB)
- @@ -221,12 +223,12 @@ $(PJMEDIA_CODEC_LIB) $(PJMEDIA_CODEC_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
-
- pjmedia-videodev: $(PJMEDIA_VIDEODEV_LIB)
- $(PJMEDIA_VIDEODEV_SONAME): $(PJMEDIA_VIDEODEV_LIB)
- -$(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME):
- +$(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
- $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
-
- pjmedia-audiodev: $(PJMEDIA_AUDIODEV_LIB)
- $(PJMEDIA_AUDIODEV_SONAME): $(PJMEDIA_AUDIODEV_LIB)
- -$(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME):
- +$(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
- $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
-
- pjsdp: $(PJSDP_LIB)
+diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile
+index 1bc08b5..cd2e63b 100644
+--- a/pjnath/build/Makefile
++++ b/pjnath/build/Makefile
+@@ -30,8 +30,8 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+ $(CC_INC)../../pjlib-util/include
+ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+ $(HOST_CXXFLAGS) $(CXXFLAGS)
+-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+- $(APP_LDFLAGS) $(LDFLAGS)
++export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(APP_LDFLAGS) $(M_LDFLAGS) \
++ $(HOST_LDFLAGS) $(LDFLAGS)
+
+ ###############################################################################
+ # Defines for building PJNATH library
+diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile
+index 49ff2d7..1d082b5 100644
+--- a/pjsip-apps/build/Makefile
++++ b/pjsip-apps/build/Makefile
+@@ -18,8 +18,8 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+ $(CC_INC)../../pjmedia/include
+ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+ $(HOST_CXXFLAGS) $(CXXFLAGS)
+-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+- $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS)
++export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(APP_LDFLAGS) $(M_LDFLAGS) \
++ $(HOST_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS)
+
+ ###############################################################################
+ # Defines for building PJSUA
- diff --git a/pjsip-apps/src/python/setup.py b/pjsip-apps/src/python/setup.py
- index 9eaed9d..8855fe5 100644
- --- a/pjsip-apps/src/python/setup.py
- +++ b/pjsip-apps/src/python/setup.py
- @@ -92,7 +92,7 @@ if platform.system() == 'Darwin':
- if version[0] == '10' and int(version[1]) >= 7:
- extra_link_args += ["-framework", "AudioUnit"]
- else:
- - extra_link_args = []
- + extra_link_args = ['-lpython2.7']
-
-
- setup(name="pjsua",
+diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
+index eef4176..29cea02 100644
+--- a/pjsip/build/Makefile
++++ b/pjsip/build/Makefile
+@@ -48,10 +48,13 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+ $(CC_INC)../../pjmedia/include
+ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+ $(HOST_CXXFLAGS) $(CXXFLAGS)
+-export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \
++export _LDFLAGS := \
++ $(CC_LDFLAGS) $(OS_LDFLAGS) $(APP_LDFLAGS) $(M_LDFLAGS) \
++ $(APP_THIRD_PARTY_LIBS) \
+ $(APP_THIRD_PARTY_EXT) \
+- $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+- $(APP_LDFLAGS) $(LDFLAGS)
++ $(HOST_LDFLAGS) \
++ $(OS_LIBS) \
++ $(LDFLAGS)
+
+ ###############################################################################
+ # Defines for building PJSIP core library
+@@ -141,7 +144,8 @@ export PJSUA2_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+ siptypes.o call.o presence.o media.o
+ export PJSUA2_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS)
+ export PJSUA2_LIB_CXXFLAGS = $(PJSUA2_LIB_CFLAGS)
+-export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB_LDLIB) \
++export PJSUA2_LIB_LDFLAGS += $(_LDFLAGS) \
++ $(PJSUA_LIB_LDLIB) \
+ $(PJSIP_UA_LDLIB) \
+ $(PJSIP_SIMPLE_LDLIB) \
+ $(PJSIP_LDLIB) \
+@@ -152,7 +156,6 @@ export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB_LDLIB) \
+ $(PJNATH_LDLIB) \
+ $(PJLIB_UTIL_LDLIB) \
+ $(PJLIB_LDLIB) \
+- $(_LDFLAGS) \
+ -lstdc++
+
+
diff --cc debian/patches/0006-WIP-merge-pjmedia-audio-video-dev-into-pjmedia.patch
index 0000000,0000000..baec12b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0006-WIP-merge-pjmedia-audio-video-dev-into-pjmedia.patch
@@@ -1,0 -1,0 +1,101 @@@
++From 90ddf35f990a14602ae0325e55a9c6ad77646a26 Mon Sep 17 00:00:00 2001
++From: Tzafrir Cohen <tzafrir at debian.org>
++Date: Wed, 30 Dec 2015 08:28:28 +0200
++Subject: WIP: merge pjmedia-{audio,video}dev into pjmedia
++
++Merge pjmedia-audiodev, pjmedia-videodev and pjmedia to a single
++library.
++
++This patch will not work stand-alone and requires the following extra
++setup:
++
++ ln -s pjmedia/src/pjmedia-audiodev/*.c pjmedia/src/pjmedia-videodev/*.c \
++ pjmedia/src/pjmedia/
++
++and cleanup:
++
++ find pjmedia/src/pjmedia -type l | xargs -r rm
++---
++ build.mak.in | 2 --
++ pjmedia/build/Makefile | 13 +++++++------
++ 2 files changed, 7 insertions(+), 8 deletions(-)
++
++diff --git a/build.mak.in b/build.mak.in
++index 7dc768c..08d8588 100644
++--- a/build.mak.in
+++++ b/build.mak.in
++@@ -255,8 +255,6 @@ export APP_LDLIBS := $(PJSUA_LIB_LDLIB) \
++ $(PJSIP_LDLIB) \
++ $(PJMEDIA_CODEC_LDLIB) \
++ $(PJMEDIA_LDLIB) \
++- $(PJMEDIA_VIDEODEV_LDLIB) \
++- $(PJMEDIA_AUDIODEV_LDLIB) \
++ $(PJMEDIA_LDLIB) \
++ $(PJNATH_LDLIB) \
++ $(PJLIB_UTIL_LDLIB) \
++diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
++index 9578a1f..a5941f5 100644
++--- a/pjmedia/build/Makefile
+++++ b/pjmedia/build/Makefile
++@@ -57,7 +57,7 @@ export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \
++ # Defines for building PJMEDIA library
++ #
++ export PJMEDIA_SRCDIR = ../src/pjmedia
++-export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+++PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
++ alaw_ulaw.o alaw_ulaw_table.o avi_player.o \
++ bidirectional.o clock_thread.o codec.o conference.o \
++ conf_switch.o converter.o converter_libswscale.o converter_libyuv.o \
++@@ -98,6 +98,7 @@ export PJMEDIA_AUDIODEV_OBJS += audiodev.o audiotest.o errno.o \
++ export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
++ export PJMEDIA_AUDIODEV_CXXFLAGS += $(_CXXFLAGS)
++ export PJMEDIA_AUDIODEV_LDFLAGS += $(PJLIB_LDLIB) \
+++ $(PJMEDIA_LDLIB) \
++ $(_LDFLAGS)
++
++
++@@ -111,9 +112,11 @@ export PJMEDIA_VIDEODEV_OBJS += errno.o videodev.o avi_dev.o ffmpeg_dev.o \
++ export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS)
++ export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS)
++ export PJMEDIA_VIDEODEV_LDFLAGS += $(PJLIB_LDLIB) \
+++ $(PJMEDIA_LDLIB) \
++ $(_LDFLAGS)
++
++
+++export PJMEDIA_OBJS += $(PJMEDIA_AUDIODEV_OBJS) $(PJMEDIA_VIDEODEV_OBJS)
++ ###############################################################################
++ # Defines for building PJSDP library
++ # Note that SDP functionality is already INCLUDED in PJMEDIA.
++@@ -177,8 +180,6 @@ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT
++ #
++ TARGETS := $(PJMEDIA_LIB) $(PJMEDIA_SONAME) \
++ $(PJMEDIA_CODEC_LIB) $(PJMEDIA_CODEC_SONAME)\
++- $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME) \
++- $(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME) \
++ $(PJSDP_LIB) $(PJSDP_SONAME)
++ TARGETS_EXE := $(PJMEDIA_TEST_EXE)
++
++@@ -211,7 +212,7 @@ distclean: realclean
++
++ pjmedia: $(PJMEDIA_LIB)
++ $(PJMEDIA_SONAME): $(PJMEDIA_LIB)
++-$(PJMEDIA_LIB) $(PJMEDIA_SONAME): $(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME) $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME)
+++$(PJMEDIA_LIB) $(PJMEDIA_SONAME):
++ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
++
++ pjmedia-codec: $(PJMEDIA_CODEC_LIB)
++@@ -221,12 +222,12 @@ $(PJMEDIA_CODEC_LIB) $(PJMEDIA_CODEC_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
++
++ pjmedia-videodev: $(PJMEDIA_VIDEODEV_LIB)
++ $(PJMEDIA_VIDEODEV_SONAME): $(PJMEDIA_VIDEODEV_LIB)
++-$(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME):
+++$(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
++ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
++
++ pjmedia-audiodev: $(PJMEDIA_AUDIODEV_LIB)
++ $(PJMEDIA_AUDIODEV_SONAME): $(PJMEDIA_AUDIODEV_LIB)
++-$(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME):
+++$(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
++ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
++
++ pjsdp: $(PJSDP_LIB)
diff --cc debian/patches/series
index fa79739,0000000..b565595
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,6 @@@
+0001-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
+0002-Replace-deprecated-FFmpeg-API.patch
+0003-add-v5-suffix-to-soname-of-libpjsua2-2.patch
- 0004-fix-link-order-WIP.patch
++0004-Pass-lpathon2.7-explicitly-to-python-module.patch
++0005-Rearange-link-order-for-building-with-as-needed.patch
++0006-WIP-merge-pjmedia-audio-video-dev-into-pjmedia.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git
More information about the Pkg-voip-commits
mailing list