[Pkg-voip-commits] [pjproject] 12/16: merge patched into master
tzafrir at debian.org
tzafrir at debian.org
Thu Dec 31 14:14:16 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 e203586b91335c7fd6e5475d612d250a1b8ed8dc
Merge: 1532c70 76b349c
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Thu Dec 31 13:20:24 2015 +0200
merge patched into master
debian/.git-dpm | 4 +-
...erge-pjmedia-audio-video-dev-into-pjmedia.patch | 80 +++++++++++++++++++---
pjmedia/build/Makefile | 7 +-
pjsip/build/Makefile | 6 --
4 files changed, 74 insertions(+), 23 deletions(-)
diff --cc debian/.git-dpm
index 7094c8e,0000000..eb62f62
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
- c794855b622e7ccd789f684a8fb3a1bef280707a
- c794855b622e7ccd789f684a8fb3a1bef280707a
++76b349cd7e8331d4ecfa2362c996733bb7affbdf
++76b349cd7e8331d4ecfa2362c996733bb7affbdf
+8bc494943161dfa21ff5d95e9ec78efd4f35e408
+8bc494943161dfa21ff5d95e9ec78efd4f35e408
+pjproject_2.4.5~dfsg.orig.tar.bz2
+be4b2b7739c3d02d6265a4cc2ca0661df38dd151
+4449242
diff --cc debian/patches/0006-WIP-merge-pjmedia-audio-video-dev-into-pjmedia.patch
index 5e3ccb4,0000000..e4124c5
mode 100644,000000..100644
--- a/debian/patches/0006-WIP-merge-pjmedia-audio-video-dev-into-pjmedia.patch
+++ b/debian/patches/0006-WIP-merge-pjmedia-audio-video-dev-into-pjmedia.patch
@@@ -1,102 -1,0 +1,164 @@@
- From c794855b622e7ccd789f684a8fb3a1bef280707a Mon Sep 17 00:00:00 2001
++From 76b349cd7e8331d4ecfa2362c996733bb7affbdf 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:
+
+ for dev in audiodev videodev; do
+ for src in pjmedia/src/pjmedia-$dev/*.c; do
+ base=${src##*/}
+ dir=${src%/*}
+ ln -s ../pjmedia-$dev/$base pjmedia/src/pjmedia/${dev}_$base
+ done
+ done
+ ln -s ../pjmedia-videodev/util.h pjmedia/src/pjmedia/util.h
+
+and cleanup:
+
+ find pjmedia/src/pjmedia -type l | xargs -r rm
+---
+ build.mak.in | 2 --
- pjmedia/build/Makefile | 12 ++++++------
- 2 files changed, 6 insertions(+), 8 deletions(-)
++ pjmedia/build/Makefile | 19 +++++++------------
++ pjsip/build/Makefile | 6 ------
++ 3 files changed, 7 insertions(+), 20 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..5b2ea17 100644
++index 9578a1f..ced9749 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 \
++@@ -79,8 +79,7 @@ export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
++
++ export PJMEDIA_CFLAGS += $(_CFLAGS)
++ export PJMEDIA_CXXFLAGS += $(_CXXFLAGS)
++-export PJMEDIA_LDFLAGS += $(PJMEDIA_VIDEODEV_LDLIB) \
++- $(PJMEDIA_AUDIODEV_LDLIB) \
+++export PJMEDIA_LDFLAGS += \
++ $(PJLIB_LDLIB) \
++ $(PJLIB_UTIL_LDLIB) \
++ $(PJNATH_LDLIB) \
++@@ -98,6 +97,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,12 @@ export PJMEDIA_VIDEODEV_OBJS += errno.o videodev.o avi_dev.o ffmpeg_dev.o \
++@@ -111,9 +111,12 @@ 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:%=audiodev_%) \
++ $(PJMEDIA_VIDEODEV_OBJS:%=videodev_%)
+ ###############################################################################
+ # Defines for building PJSDP library
+ # Note that SDP functionality is already INCLUDED in PJMEDIA.
- @@ -177,8 +181,6 @@ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT
++@@ -159,9 +162,7 @@ export PJMEDIA_TEST_OBJS += sdp_neg_test.o
++ export PJMEDIA_TEST_CFLAGS += $(_CFLAGS)
++ export PJMEDIA_TEST_CXXFLAGS += $(_CXXFLAGS)
++ export PJMEDIA_TEST_LDFLAGS += $(PJMEDIA_CODEC_LDLIB) \
++- $(PJMEDIA_VIDEODEV_LDLIB) \
++ $(PJMEDIA_LDLIB) \
++- $(PJMEDIA_AUDIODEV_LDLIB) \
++ $(PJLIB_LDLIB) \
++ $(PJLIB_UTIL_LDLIB) \
++ $(PJNATH_LDLIB) \
++@@ -177,8 +178,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 +213,7 @@ distclean: realclean
++@@ -211,7 +210,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)
- @@ -281,8 +283,6 @@ realclean:
++@@ -236,8 +235,6 @@ $(PJSDP_LIB) $(PJSDP_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
++
++ pjmedia-test: $(PJMEDIA_TEST_EXE)
++ $(PJMEDIA_TEST_EXE): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
++-$(PJMEDIA_TEST_EXE): $(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME)
++-$(PJMEDIA_TEST_EXE): $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME)
++ $(PJMEDIA_TEST_EXE): $(PJMEDIA_CODEC_LIB) $(PJMEDIA_CODEC_SONAME)
++ $(PJMEDIA_TEST_EXE):
++ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $(BINDIR)/$@
++@@ -281,8 +278,6 @@ realclean:
+
+ depend:
+ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@
+- $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $@
+- $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $@
+ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@
+ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@
+ $(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $@
++diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
++index 29cea02..32a67dc 100644
++--- a/pjsip/build/Makefile
+++++ b/pjsip/build/Makefile
++@@ -123,8 +123,6 @@ export PJSUA_LIB_CXXFLAGS += $(_CXXFLAGS) $(PJ_VIDEO_CFLAGS)
++ export PJSUA_LIB_LDFLAGS += $(PJSIP_UA_LDLIB) \
++ $(PJSIP_SIMPLE_LDLIB) \
++ $(PJSIP_LDLIB) \
++- $(PJMEDIA_AUDIODEV_LDLIB) \
++- $(PJMEDIA_VIDEODEV_LDLIB) \
++ $(PJMEDIA_CODEC_LDLIB) \
++ $(PJMEDIA_LDLIB) \
++ $(PJNATH_LDLIB) \
++@@ -149,8 +147,6 @@ export PJSUA2_LIB_LDFLAGS += $(_LDFLAGS) \
++ $(PJSIP_UA_LDLIB) \
++ $(PJSIP_SIMPLE_LDLIB) \
++ $(PJSIP_LDLIB) \
++- $(PJMEDIA_AUDIODEV_LDLIB) \
++- $(PJMEDIA_VIDEODEV_LDLIB) \
++ $(PJMEDIA_CODEC_LDLIB) \
++ $(PJMEDIA_LDLIB) \
++ $(PJNATH_LDLIB) \
++@@ -191,9 +187,7 @@ export TEST_LDFLAGS += $(PJSIP_LDLIB) \
++ $(PJSIP_SIMPLE_LDLIB) \
++ $(PJSUA_LDLIB) \
++ $(PJMEDIA_CODEC_LDLIB) \
++- $(PJMEDIA_VIDEODEV_LDLIB) \
++ $(PJMEDIA_LDLIB) \
++- $(PJMEDIA_AUDIODEV_LDLIB) \
++ $(PJLIB_UTIL_LDLIB) \
++ $(PJNATH_LDLIB) \
++ $(PJLIB_LDLIB) \
--
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