[Pkg-voip-commits] [pjproject] 07/16: symlink pjmedia-{audio|video}dev files to main lib
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 c819d9b3df1e51d22e6dea3a6acecf951afdd2b7
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Thu Dec 31 11:53:22 2015 +0200
symlink pjmedia-{audio|video}dev files to main lib
* Copy (by the way of symlinking) the source files from
pjmedia/src/pjmedia-audiodev and pjmedia/src/pjmedia-audiodev into
the pjmedia/src/pjmedia itself.
- Sources are prefixed with audiodev_ / videodev_ to ensure unique
names.
* Add symbols from libpjmedia-audiodev and libpjmedia-videodev to
libpjmedia's symbols.
---
debian/libpjmedia2.symbols | 61 ++++++++++++++++++++++++++++++++++++++++++++++
debian/rules | 12 +++++++++
2 files changed, 73 insertions(+)
diff --git a/debian/libpjmedia2.symbols b/debian/libpjmedia2.symbols
index 9cbb29b..05670af 100644
--- a/debian/libpjmedia2.symbols
+++ b/debian/libpjmedia2.symbols
@@ -11,6 +11,33 @@ libpjmedia.so.2 libpjmedia2 #MINVER#
pjmedia_add_bandwidth_tias_in_sdp at Base 2.1.0~ast20130801
pjmedia_add_rtpmap_for_static_pt at Base 2.1.0~ast20130801
pjmedia_alaw2linear_tab at Base 2.1.0~ast20130801
+ pjmedia_aud_dev_cap_name at Base 2.4.5~dfsg-1
+ pjmedia_aud_dev_count at Base 2.4.5~dfsg-1
+ pjmedia_aud_dev_default_param at Base 2.4.5~dfsg-1
+ pjmedia_aud_dev_get_info at Base 2.4.5~dfsg-1
+ pjmedia_aud_dev_lookup at Base 2.4.5~dfsg-1
+ pjmedia_aud_dev_refresh at Base 2.4.5~dfsg-1
+ pjmedia_aud_param_get_cap at Base 2.4.5~dfsg-1
+ pjmedia_aud_param_set_cap at Base 2.4.5~dfsg-1
+ pjmedia_aud_register_factory at Base 2.4.5~dfsg-1
+ pjmedia_aud_stream_create at Base 2.4.5~dfsg-1
+ pjmedia_aud_stream_destroy at Base 2.4.5~dfsg-1
+ pjmedia_aud_stream_get_cap at Base 2.4.5~dfsg-1
+ pjmedia_aud_stream_get_param at Base 2.4.5~dfsg-1
+ pjmedia_aud_stream_set_cap at Base 2.4.5~dfsg-1
+ pjmedia_aud_stream_start at Base 2.4.5~dfsg-1
+ pjmedia_aud_stream_stop at Base 2.4.5~dfsg-1
+ pjmedia_aud_subsys_get_pool_factory at Base 2.4.5~dfsg-1
+ pjmedia_aud_subsys_init at Base 2.4.5~dfsg-1
+ pjmedia_aud_subsys_shutdown at Base 2.4.5~dfsg-1
+ pjmedia_aud_test at Base 2.4.5~dfsg-1
+ pjmedia_aud_unregister_factory at Base 2.4.5~dfsg-1
+ pjmedia_audiodev_strerror at Base 2.4.5~dfsg-1
+ pjmedia_avi_dev_alloc at Base 2.4.5~dfsg-1
+ pjmedia_avi_dev_create_factory at Base 2.4.5~dfsg-1
+ pjmedia_avi_dev_free at Base 2.4.5~dfsg-1
+ pjmedia_avi_dev_get_param at Base 2.4.5~dfsg-1
+ pjmedia_avi_dev_param_default at Base 2.4.5~dfsg-1
pjmedia_avi_player_create_streams at Base 2.3~dfsg
pjmedia_avi_stream_get_len at Base 2.3~dfsg
pjmedia_avi_stream_set_eof_cb at Base 2.3~dfsg
@@ -19,6 +46,7 @@ libpjmedia.so.2 libpjmedia2 #MINVER#
pjmedia_avi_streams_get_stream_by_media at Base 2.3~dfsg
pjmedia_bidirectional_port_create at Base 2.1.0~ast20130801
pjmedia_calc_avg_signal at Base 2.1.0~ast20130801
+ pjmedia_cbar_factory at Base 2.4.5~dfsg-1
pjmedia_clock_create2 at Base 2.1.0~ast20130801
pjmedia_clock_create at Base 2.1.0~ast20130801
pjmedia_clock_destroy at Base 2.1.0~ast20130801
@@ -159,6 +187,7 @@ libpjmedia.so.2 libpjmedia2 #MINVER#
pjmedia_mem_player_create at Base 2.1.0~ast20130801
pjmedia_mem_player_set_eof_cb at Base 2.1.0~ast20130801
pjmedia_null_port_create at Base 2.1.0~ast20130801
+ pjmedia_pa_factory at Base 2.4.5~dfsg-1
pjmedia_plc_create at Base 2.1.0~ast20130801
pjmedia_plc_generate at Base 2.1.0~ast20130801
pjmedia_plc_save at Base 2.1.0~ast20130801
@@ -197,6 +226,7 @@ libpjmedia.so.2 libpjmedia2 #MINVER#
pjmedia_rtp_session_init at Base 2.1.0~ast20130801
pjmedia_rtp_session_update2 at Base 2.1.0~ast20130801
pjmedia_rtp_session_update at Base 2.1.0~ast20130801
+ pjmedia_sdl_factory at Base 2.4.5~dfsg-1
pjmedia_sdp_attr_add at Base 2.1.0~ast20130801
pjmedia_sdp_attr_clone at Base 2.1.0~ast20130801
pjmedia_sdp_attr_create at Base 2.1.0~ast20130801
@@ -355,6 +385,7 @@ libpjmedia.so.2 libpjmedia2 #MINVER#
pjmedia_transport_udp_create at Base 2.1.0~ast20130801
pjmedia_type_name at Base 2.1.0~ast20130801
pjmedia_ulaw2linear_tab at Base 2.1.0~ast20130801
+ pjmedia_v4l2_factory at Base 2.4.5~dfsg-1
pjmedia_vid_codec_h263_apply_fmtp at Base 2.3~dfsg
pjmedia_vid_codec_h264_apply_fmtp at Base 2.3~dfsg
pjmedia_vid_codec_h264_match_sdp at Base 2.3~dfsg
@@ -377,6 +408,33 @@ libpjmedia.so.2 libpjmedia2 #MINVER#
pjmedia_vid_codec_mgr_unregister_factory at Base 2.3~dfsg
pjmedia_vid_codec_param_clone at Base 2.3~dfsg
pjmedia_vid_codec_parse_h263_fmtp at Base 2.3~dfsg
+ pjmedia_vid_dev_cap_name at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_conv_create_converter at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_conv_destroy_converter at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_conv_resize_and_rotate at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_conv_set_rotation at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_count at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_default_param at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_get_global_index at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_get_info at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_get_local_index at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_lookup at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_param_get_cap at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_param_set_cap at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_refresh at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_stream_create at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_stream_destroy at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_stream_get_cap at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_stream_get_frame at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_stream_get_param at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_stream_is_running at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_stream_put_frame at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_stream_set_cap at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_stream_start at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_stream_stop at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_subsys_get_pool_factory at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_subsys_init at Base 2.4.5~dfsg-1
+ pjmedia_vid_dev_subsys_shutdown at Base 2.4.5~dfsg-1
pjmedia_vid_port_connect at Base 2.3~dfsg
pjmedia_vid_port_create at Base 2.3~dfsg
pjmedia_vid_port_destroy at Base 2.3~dfsg
@@ -391,6 +449,7 @@ libpjmedia.so.2 libpjmedia2 #MINVER#
pjmedia_vid_port_set_clock_src at Base 2.3~dfsg
pjmedia_vid_port_start at Base 2.3~dfsg
pjmedia_vid_port_stop at Base 2.3~dfsg
+ pjmedia_vid_register_factory at Base 2.4.5~dfsg-1
pjmedia_vid_stream_create at Base 2.3~dfsg
pjmedia_vid_stream_destroy at Base 2.3~dfsg
pjmedia_vid_stream_get_info at Base 2.3~dfsg
@@ -412,10 +471,12 @@ libpjmedia.so.2 libpjmedia2 #MINVER#
pjmedia_vid_tee_add_dst_port at Base 2.3~dfsg
pjmedia_vid_tee_create at Base 2.3~dfsg
pjmedia_vid_tee_remove_dst_port at Base 2.3~dfsg
+ pjmedia_vid_unregister_factory at Base 2.4.5~dfsg-1
pjmedia_video_format_mgr_create at Base 2.3~dfsg
pjmedia_video_format_mgr_destroy at Base 2.3~dfsg
pjmedia_video_format_mgr_instance at Base 2.3~dfsg
pjmedia_video_format_mgr_set_instance at Base 2.3~dfsg
+ pjmedia_videodev_strerror at Base 2.4.5~dfsg-1
pjmedia_wav_player_get_info at Base 2.3~dfsg
pjmedia_wav_player_get_len at Base 2.1.0~ast20130801
pjmedia_wav_player_port_create at Base 2.1.0~ast20130801
diff --git a/debian/rules b/debian/rules
index 34c751b..2803457 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,7 @@ override_dh_auto_clean:
# left-overs from the tests:
find tests/pjsua/ -name \*.pyc | xargs --no-run-if-empty rm
rm -rf tests/pjsua/logs/ tests/pjsua/wavs/
+ find pjmedia/src/pjmedia -type l | xargs -r rm
override_dh_auto_configure:
cp debian/config_site.h pjlib/include/pj/
@@ -35,6 +36,17 @@ ifneq (,$(wildcard third-party/ilbc/iLBC_decode.c))
# remove from the source tree
@echo "iLBC was not removed. Exiting"; exit 1
endif
+ @# move (by symlinking) the files from pjmedia-audiodev and videodev
+ @# to pjmedia to merge those libraries. In order to avoid collisions,
+ @# they get prefixes:
+ 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
dh_auto_configure -- --enable-shared \
--disable-g7221-codec --disable-ilbc-codec --disable-resample \
--with-external-gsm --with-external-speex --with-external-pa \
--
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