FreeBSD Bugzilla – Attachment 170381 Details for
Bug 209542
[NEW PORT] net-im/ring-daemon: Ring VoIP SIP softphone and IM (daemon part)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
shar archive
ring-daemon.shar (text/plain), 21.83 KB, created by
Yuri Victorovich
on 2016-05-17 00:40:20 UTC
(
hide
)
Description:
shar archive
Filename:
MIME Type:
Creator:
Yuri Victorovich
Created:
2016-05-17 00:40:20 UTC
Size:
21.83 KB
patch
obsolete
># This is a shell archive. Save it in a file, remove anything before ># this line, and then unpack it by entering "sh file". Note, it may ># create directories; files and directories will be owned by you and ># have default permissions. ># ># This archive contains: ># ># net-im/ring-daemon ># net-im/ring-daemon/Makefile ># net-im/ring-daemon/distinfo ># net-im/ring-daemon/pkg-descr ># net-im/ring-daemon/files ># net-im/ring-daemon/files/patch-contrib_src_main.mak ># net-im/ring-daemon/files/patch-contrib_src_pjproject_rules.mak ># net-im/ring-daemon/files/patch-configure.ac ># net-im/ring-daemon/files/patch-contrib_bootstrap ># net-im/ring-daemon/files/patch-src_archiver.cpp ># net-im/ring-daemon/files/patch-contrib_native_pjproject_aconfigure.ac ># net-im/ring-daemon/files/patch-contrib_native_pjproject_pjsip_build_Makefile ># net-im/ring-daemon/files/patch-contrib_native_pjproject-2.4.5_aconfigure ># net-im/ring-daemon/files/patch-contrib_native_pjproject-2.4.5_build.mak.in ># net-im/ring-daemon/files/patch-src_media_video_Makefile.am ># net-im/ring-daemon/files/patch-src_Makefile.am ># net-im/ring-daemon/files/patch-src_media_video_test_Makefile.am ># net-im/ring-daemon/files/patch-src_media_video_v4l2_video__device__monitor__impl.cpp ># net-im/ring-daemon/files/patch-src_media_video_v4l2_video__device__impl.cpp ># net-im/ring-daemon/files/patch-contrib_src_uuid_rules.mak ># net-im/ring-daemon/pkg-plist ># >echo c - net-im/ring-daemon >mkdir -p net-im/ring-daemon > /dev/null 2>&1 >echo x - net-im/ring-daemon/Makefile >sed 's/^X//' >net-im/ring-daemon/Makefile << 'fc0ac5cde7bc707ed0a8d7f8a62aa9a5' >X# Created by: Yuri Victorovich <yuri@rawbw.com> >X# $FreeBSD$ >X >XPORTNAME= ring-daemon >XPORTVERSION= 0.160516 >XDISTVERSIONPREFIX= v >XCATEGORIES= net-im net-p2p >X >XMAINTAINER= yuri@rawbw.com >XCOMMENT= Daemon part of the Ring VoIP SIP phone and IM >X >XLICENSE= GPLv3 >X >XBUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat >XLIB_DEPENDS= libyaml-cpp.so:devel/yaml-cpp \ >X libjsoncpp.so:devel/jsoncpp \ >X libpcre.so:devel/pcre \ >X libopendht.so:devel/opendht \ >X libgnutls.so:security/gnutls \ >X libavcodec.so:multimedia/ffmpeg \ >X libpulse.so:audio/pulseaudio \ >X libsndfile.so:audio/libsndfile \ >X libsamplerate.so:audio/libsamplerate \ >X libspeex.so:audio/speex \ >X libspeexdsp.so:audio/speexdsp \ >X libuuid.so:misc/e2fsprogs-libuuid >X >XBROKEN_FreeBSD_9= Fails due to compiler issues >X >XUSE_GITHUB= yes >XGH_TUPLE+= savoirfairelinux:ring-daemon:56ec56f >XGH_TUPLE+= pjsip:pjproject:2.4.5:pj >X >XCONFIGURE_ARGS= --without-dbus \ >X --without-gsm \ >X --enable-video \ >X --enable-ipv6 >X >XUSES= autoreconf compiler:c++14-lang gmake libtool pkgconfig >XUSE_GNOME= glib20 gtk20 cairo gdkpixbuf2 >XUSE_XORG= x11 xscrnsaver >XUSE_GL= gl >XUSE_QT5= core gui network xml opengl sql sql-sqlite3_run widgets svg \ >X concurrent buildtools_build linguisttools_build >XGNU_CONFIGURE= yes >XMYFLAGS= -I${WRKSRC}/contrib/native/pjproject/pjlib/include -I${LOCALBASE}/include -DPJ_LINUX -I${LOCALBASE}/include/jsoncpp >XCFLAGS+= ${MYFLAGS} >XCPPFLAGS+= ${MYFLAGS} >XCXXFLAGS+= ${MYFLAGS} >XUSE_LDCONFIG= yes >X >Xpost-extract: >X @${MKDIR} ${WRKSRC}/contrib/native >X @${MV} ${WRKDIR}/pjproject-2.4.5 ${WRKSRC}/contrib/native/ >Xpost-patch: >X @${REINPLACE_CMD} -e 's|PJPROJECT_OPTIONS)|PJPROJECT_OPTIONS) CPPFLAGS=-I${LOCALBASE}/include/ CFLAGS="-I${LOCALBASE}/include/ -fPIC"|g' \ >X ${WRKSRC}/contrib/src/pjproject/rules.mak >Xpre-configure: >X @(cd ${WRKSRC} && \ >X ${ECHO} "===> Building the custom version of pjsip" && \ >X cd contrib/native && \ >X ../bootstrap && \ >X ${GMAKE} .pjproject) >Xpost-stage: >X @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libring.so >X >X.include <bsd.port.mk> >fc0ac5cde7bc707ed0a8d7f8a62aa9a5 >echo x - net-im/ring-daemon/distinfo >sed 's/^X//' >net-im/ring-daemon/distinfo << '0a69bc0d3e0b1d1d5ad441285d1235fe' >XTIMESTAMP = 1463424490 >XSHA256 (savoirfairelinux-ring-daemon-v0.160516-56ec56f_GH0.tar.gz) = 46ef728350b2a8ad1328c2ad805702f26d7bd5af54b7195d364d7f012c33d540 >XSIZE (savoirfairelinux-ring-daemon-v0.160516-56ec56f_GH0.tar.gz) = 2626013 >XSHA256 (pjsip-pjproject-2.4.5_GH0.tar.gz) = 3678608de92cb0ed1248464fbeb20af9ddc05c1ad55aea3d40ff8e4ec784c91f >XSIZE (pjsip-pjproject-2.4.5_GH0.tar.gz) = 7627091 >0a69bc0d3e0b1d1d5ad441285d1235fe >echo x - net-im/ring-daemon/pkg-descr >sed 's/^X//' >net-im/ring-daemon/pkg-descr << '91c1e062101ce1f85eb5425bfbee88a7' >XRing is a secure and distributed voice, video and chat communication platform >Xthat requires no centralized server and leaves the power of privacy in the hands >Xof the user. >X >XWWW: https://ring.cx/ >91c1e062101ce1f85eb5425bfbee88a7 >echo c - net-im/ring-daemon/files >mkdir -p net-im/ring-daemon/files > /dev/null 2>&1 >echo x - net-im/ring-daemon/files/patch-contrib_src_main.mak >sed 's/^X//' >net-im/ring-daemon/files/patch-contrib_src_main.mak << '4abf348b4cf3ba28ff42b1444fd66e79' >X--- contrib/src/main.mak.orig 2016-05-10 20:45:50 UTC >X+++ contrib/src/main.mak >X@@ -78,10 +78,10 @@ endif >X # >X ifndef HAVE_CROSS_COMPILE >X ifneq ($(findstring $(origin CC),undefined default),) >X-CC := gcc >X+CC := cc >X endif >X ifneq ($(findstring $(origin CXX),undefined default),) >X-CXX := g++ >X+CXX := c++ >X endif >X ifneq ($(findstring $(origin LD),undefined default),) >X LD := ld >X@@ -97,10 +97,10 @@ STRIP := strip >X endif >X else >X ifneq ($(findstring $(origin CC),undefined default),) >X-CC := $(CROSS_COMPILE)gcc >X+CC := $(CROSS_COMPILE)cc >X endif >X ifneq ($(findstring $(origin CXX),undefined default),) >X-CXX := $(CROSS_COMPILE)g++ >X+CXX := $(CROSS_COMPILE)c++ >X endif >X ifneq ($(findstring $(origin LD),undefined default),) >X LD := $(CROSS_COMPILE)ld >X@@ -117,8 +117,8 @@ endif >X endif >X >X ifdef HAVE_ANDROID >X-CC := $(CROSS_COMPILE)gcc --sysroot=$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLATFORM_SHORT_ARCH) >X-CXX := $(CROSS_COMPILE)g++ --sysroot=$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLATFORM_SHORT_ARCH) >X+CC := $(CROSS_COMPILE)cc --sysroot=$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLATFORM_SHORT_ARCH) >X+CXX := $(CROSS_COMPILE)c++ --sysroot=$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLATFORM_SHORT_ARCH) >X endif >X >X ifdef HAVE_MACOSX >X@@ -256,15 +256,15 @@ else >X ZCAT ?= $(error Gunzip client (zcat) not found!) >X endif >X >X-ifeq ($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),) >X-SHA512SUM = sha512sum --check >X-else ifeq ($(shell shasum --version >/dev/null 2>&1 || echo FAIL),) >X-SHA512SUM = shasum -a 512 --check >X-else ifeq ($(shell openssl version >/dev/null 2>&1 || echo FAIL),) >X-SHA512SUM = openssl dgst -sha512 >X-else >X-SHA512SUM = $(error SHA-512 checksumming not found!) >X-endif >X+#ifeq ($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),) >X+#SHA512SUM = sha512sum --check >X+#else ifeq ($(shell shasum --version >/dev/null 2>&1 || echo FAIL),) >X+#SHA512SUM = shasum -a 512 --check >X+#else ifeq ($(shell openssl version >/dev/null 2>&1 || echo FAIL),) >X+#SHA512SUM = openssl dgst -sha512 >X+#else >X+#SHA512SUM = $(error SHA-512 checksumming not found!) >X+#endif >X >X # >X # Common helpers >X@@ -320,7 +320,7 @@ checksum = \ >X "$(SRC)/$(patsubst .sum-%,%,$@)/$(2)SUMS" &&) \ >X (cd $(TARBALLS) && $(1) /dev/stdin) < \ >X "$(SRC)/$(patsubst .sum-%,%,$@)/$(2)SUMS" >X-CHECK_SHA512 = $(call checksum,$(SHA512SUM),SHA512) >X+#CHECK_SHA512 = $(call checksum,$(SHA512SUM),SHA512) >X UNPACK = $(RM) -R $@ \ >X $(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xvzf $(f)) \ >X $(foreach f,$(filter %.tar.bz2,$^), && tar xvjf $(f)) \ >X@@ -459,12 +459,12 @@ endif >X echo "set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> $@ >X >X # Default pattern rules >X-.sum-%: $(SRC)/%/SHA512SUMS >X- $(CHECK_SHA512) >X- touch $@ >X+#.sum-%: $(SRC)/%/SHA512SUMS >X+# $(CHECK_SHA512) >X+# touch $@ >X >X-.sum-%: >X- $(error Download and check target not defined for $*) >X+#.sum-%: >X+# $(error Download and check target not defined for $*) >X >X # Dummy dependency on found packages >X $(patsubst %,.dep-%,$(PKGS_FOUND)): .dep-%: >4abf348b4cf3ba28ff42b1444fd66e79 >echo x - net-im/ring-daemon/files/patch-contrib_src_pjproject_rules.mak >sed 's/^X//' >net-im/ring-daemon/files/patch-contrib_src_pjproject_rules.mak << '5bfccd980766e171be826fe19980b19e' >X--- contrib/src/pjproject/rules.mak.orig 2016-05-10 20:45:50 UTC >X+++ contrib/src/pjproject/rules.mak >X@@ -42,17 +42,17 @@ endif >X DEPS_pjproject += gnutls >X ifndef HAVE_WIN32 >X ifndef HAVE_MACOSX >X-DEPS_pjproject += uuid >X+#DEPS_pjproject += uuid >X endif >X endif >X >X $(TARBALLS)/pjproject-$(PJPROJECT_VERSION).tar.bz2: >X- $(call download,$(PJPROJECT_URL)) >X+ #$(call download,$(PJPROJECT_URL)) >X >X-.sum-pjproject: pjproject-$(PJPROJECT_VERSION).tar.bz2 >X+#.sum-pjproject: pjproject-$(PJPROJECT_VERSION).tar.bz2 >X >X-pjproject: pjproject-$(PJPROJECT_VERSION).tar.bz2 .sum-pjproject >X- $(UNPACK) >X+pjproject: pjproject-$(PJPROJECT_VERSION).tar.bz2 >X+ #$(UNPACK) >X ifdef HAVE_WIN32 >X $(APPLY) $(SRC)/pjproject/intptr_t.patch >X $(APPLY) $(SRC)/pjproject/pj_win.patch >X@@ -68,6 +68,6 @@ endif >X $(MOVE) >X >X .pjproject: pjproject >X- cd $< && $(HOSTVARS) ./aconfigure $(HOSTCONF) $(PJPROJECT_OPTIONS) >X+ cd $< && $(HOSTVARS) ./aconfigure $(HOSTCONF) $(PJPROJECT_OPTIONS) CPPFLAGS=-I/usr/local/include/ CFLAGS="-I/usr/local/include/ -fPIC" >X cd $< && CFLAGS="$(PJPROJECT_EXTRA_CFLAGS)" $(MAKE) && $(MAKE) install >X touch $@ >5bfccd980766e171be826fe19980b19e >echo x - net-im/ring-daemon/files/patch-configure.ac >sed 's/^X//' >net-im/ring-daemon/files/patch-configure.ac << '745ad28ac2278893dcff9b1b7a08e5c9' >X--- configure.ac.orig 2016-05-10 20:45:50 UTC >X+++ configure.ac >X@@ -48,6 +48,13 @@ case "${host_os}" in >X # Needed for plugin system >X LDFLAGS+=" -ldl" >X ;; >X+ freebsd*) >X+ SYS=freebsd >X+ # Necessary for linking .a to a .so >X+ LDFLAGS+=" -Wl,-Bsymbolic" >X+ # Needed for plugin system >X+ LDFLAGS+=" -ldl" >X+ ;; >X darwin*) >X SYS=darwin >X >X@@ -95,6 +102,7 @@ case "${host_os}" in >X esac >X AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin") >X AM_CONDITIONAL(HAVE_LINUX, test "${SYS}" = "linux") >X+AM_CONDITIONAL(HAVE_FREEBSD, test "${SYS}" = "freebsd") >X AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") >X AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1") >X AM_CONDITIONAL(HAVE_OSX, test "${HAVE_OSX}" = "1") >X@@ -189,10 +197,10 @@ AC_ARG_WITH(contrib, >X ]) >X AC_MSG_CHECKING([for 3rd party libraries path]) >X AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [ >X- CONTRIB_DIR="${srcdir}/contrib/${host}" >X+ CONTRIB_DIR="${srcdir}/contrib/`uname -m`-portbld-freebsd" >X AS_IF([test ! -d "${CONTRIB_DIR}"], [ >X echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD >X- CONTRIB_DIR="${srcdir}/contrib/`$CC -dumpmachine`" >X+ CONTRIB_DIR="${srcdir}/contrib/`uname -m`-portbld-freebsd" >X AS_IF([test ! -d "${CONTRIB_DIR}"], [ >X echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD >X CONTRIB_DIR="" >X@@ -295,7 +303,7 @@ fi >X AM_CONDITIONAL(BUILD_ALSA, test "x$with_alsa" = "xyes") >X >X >X-if test "${SYS}" = "linux"; then >X+if test "${SYS}" = "linux" || test "${SYS}" = "freebsd"; then >X dnl Check for pulseaudio development package - name: libpulse-dev >X LIBPULSE_MIN_VERSION=0.9.15 >X AC_ARG_WITH([pulse], >745ad28ac2278893dcff9b1b7a08e5c9 >echo x - net-im/ring-daemon/files/patch-contrib_bootstrap >sed 's/^X//' >net-im/ring-daemon/files/patch-contrib_bootstrap << '71a7844318e6b994313967731cb33e84' >X--- contrib/bootstrap.orig 2016-05-10 20:45:50 UTC >X+++ contrib/bootstrap >X@@ -74,7 +74,7 @@ done >X if test -z "$BUILD" >X then >X echo -n "Guessing build system... " >X- BUILD="`${CC:-cc} -dumpmachine`" >X+ BUILD="`uname -m`-portbld-freebsd" >X if test -z "$BUILD"; then >X echo "FAIL!" >X exit 1 >X@@ -212,6 +212,9 @@ case "${OS}" in >X add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A" >X fi >X ;; >X+ *freebsd*) >X+ add_make_enabled "HAVE_FREEBSD" >X+ ;; >X *bsd*) >X add_make_enabled "HAVE_BSD" >X ;; >71a7844318e6b994313967731cb33e84 >echo x - net-im/ring-daemon/files/patch-src_archiver.cpp >sed 's/^X//' >net-im/ring-daemon/files/patch-src_archiver.cpp << 'ebb0d3f60a717d73dfd18c46faef1552' >X--- src/archiver.cpp.orig 2016-05-14 05:34:47 UTC >X+++ src/archiver.cpp >X@@ -97,7 +97,8 @@ Archiver::exportAccounts(std::vector<std >X } >X >X // Encrypt using provided password >X- auto encrypted = dht::crypto::aesEncrypt(compressed, password); >X+ dht::Blob blob; for (auto c : password) blob.push_back(c); >X+ auto encrypted = dht::crypto::aesEncrypt(compressed, blob); >X >X // Write >X try { >X@@ -151,7 +152,8 @@ Archiver::importAccounts(std::string arc >X >X // Decrypt >X try { >X- file = dht::crypto::aesDecrypt(file, password); >X+ dht::Blob blob; for (auto c : password) blob.push_back(c); >X+ file = dht::crypto::aesDecrypt(file, blob); >X } catch (const std::exception& ex) { >X RING_ERR("Decryption failed: %s", ex.what()); >X return EPERM; >ebb0d3f60a717d73dfd18c46faef1552 >echo x - net-im/ring-daemon/files/patch-contrib_native_pjproject_aconfigure.ac >sed 's/^X//' >net-im/ring-daemon/files/patch-contrib_native_pjproject_aconfigure.ac << 'e3571141974393059bc2cb7678117111' >X--- contrib/native/pjproject-2.4.5/aconfigure.ac.orig 2015-08-12 04:46:22 UTC >X+++ contrib/native/pjproject-2.4.5/aconfigure.ac >X@@ -1151,7 +1151,7 @@ AC_ARG_ENABLE(openh264, >X >X AC_MSG_CHECKING([OpenH264 usability]) >X >X- OPENH264_LIBS="-lopenh264 -lstdc++" >X+ OPENH264_LIBS="-lopenh264" >X >X SAVED_LIBS="$LIBS" >X SAVED_LDFLAGS="$LDFLAGS" >e3571141974393059bc2cb7678117111 >echo x - net-im/ring-daemon/files/patch-contrib_native_pjproject_pjsip_build_Makefile >sed 's/^X//' >net-im/ring-daemon/files/patch-contrib_native_pjproject_pjsip_build_Makefile << '93bfed002354fe853f5ab7f50c8bde2a' >X--- contrib/native/pjproject-2.4.5/pjsip/build/Makefile.orig 2016-05-14 06:46:45 UTC >X+++ contrib/native/pjproject-2.4.5/pjsip/build/Makefile >X@@ -152,8 +152,7 @@ export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB >X $(PJNATH_LDLIB) \ >X $(PJLIB_UTIL_LDLIB) \ >X $(PJLIB_LDLIB) \ >X- $(_LDFLAGS) \ >X- -lstdc++ >X+ $(_LDFLAGS) >X >X >X ############################################################################### >93bfed002354fe853f5ab7f50c8bde2a >echo x - net-im/ring-daemon/files/patch-contrib_native_pjproject-2.4.5_aconfigure >sed 's/^X//' >net-im/ring-daemon/files/patch-contrib_native_pjproject-2.4.5_aconfigure << '9e5c3339112f2212cb61a84836668aad' >X--- contrib/native/pjproject-2.4.5/aconfigure.orig 2016-05-14 06:53:34 UTC >X+++ contrib/native/pjproject-2.4.5/aconfigure >X@@ -7158,7 +7158,7 @@ $as_echo "Using OpenH264 prefix... $with >X { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH264 usability" >&5 >X $as_echo_n "checking OpenH264 usability... " >&6; } >X >X- OPENH264_LIBS="-lopenh264 -lstdc++" >X+ OPENH264_LIBS="-lopenh264" >X >X SAVED_LIBS="$LIBS" >X SAVED_LDFLAGS="$LDFLAGS" >9e5c3339112f2212cb61a84836668aad >echo x - net-im/ring-daemon/files/patch-contrib_native_pjproject-2.4.5_build.mak.in >sed 's/^X//' >net-im/ring-daemon/files/patch-contrib_native_pjproject-2.4.5_build.mak.in << '913582900b09844dc1b3752e0243ff4c' >X--- contrib/native/pjproject-2.4.5/build.mak.in.orig 2016-05-14 07:01:06 UTC >X+++ contrib/native/pjproject-2.4.5/build.mak.in >X@@ -265,7 +265,6 @@ export APP_LDLIBS := $(PJSUA_LIB_LDLIB) >X $(PJLIB_LDLIB) \ >X @LIBS@ >X export APP_LDXXLIBS := $(PJSUA2_LIB_LDLIB) \ >X- -lstdc++ \ >X $(APP_LDLIBS) >X >X # Here are the variabels to use if application is using the library >913582900b09844dc1b3752e0243ff4c >echo x - net-im/ring-daemon/files/patch-src_media_video_Makefile.am >sed 's/^X//' >net-im/ring-daemon/files/patch-src_media_video_Makefile.am << '972374fbba01c432d96f5aa41bc614fe' >X--- src/media/video/Makefile.am.orig 2016-05-14 17:42:47 UTC >X+++ src/media/video/Makefile.am >X@@ -2,7 +2,7 @@ include $(top_srcdir)/globals.mak >X >X SUBDIRS= test >X >X-if HAVE_LINUX >X+if HAVE_FREEBSD >X if HAVE_ANDROID >X SUBDIRS+= \ >X androidvideo >972374fbba01c432d96f5aa41bc614fe >echo x - net-im/ring-daemon/files/patch-src_Makefile.am >sed 's/^X//' >net-im/ring-daemon/files/patch-src_Makefile.am << '1785bda9df7fc32194b01643eb366a2b' >X--- src/Makefile.am.orig 2016-05-14 17:48:05 UTC >X+++ src/Makefile.am >X@@ -4,7 +4,7 @@ RING_VIDEO_LIBS= >X >X if RING_VIDEO >X RING_VIDEO_LIBS+=./media/video/libvideo.la >X-if HAVE_LINUX >X+if HAVE_FREEBSD >X if HAVE_ANDROID >X RING_VIDEO_LIBS+= \ >X ./media/video/androidvideo/libandroidvideo.la >1785bda9df7fc32194b01643eb366a2b >echo x - net-im/ring-daemon/files/patch-src_media_video_test_Makefile.am >sed 's/^X//' >net-im/ring-daemon/files/patch-src_media_video_test_Makefile.am << '2d8381ec91983b57e858891f6094240a' >X--- src/media/video/test/Makefile.am.orig 2016-05-14 17:43:29 UTC >X+++ src/media/video/test/Makefile.am >X@@ -9,7 +9,7 @@ test_video_rtp_LDADD=$(top_builddir)/src >X test_video_input_SOURCES=test_video_input.cpp test_video_input.h >X test_video_input_LDADD=$(top_builddir)/src/libring.la $(top_builddir)/src/media/video/libvideo.la $(YAML_LIBS) >X >X-if HAVE_LINUX >X+if HAVE_FREEBSD >X test_shm_SOURCES=test_shm.cpp shm_src.cpp shm_src.h >X test_shm_LDADD=$(top_builddir)/src/libring.la $(top_builddir)/src/media/video/libvideo.la $(YAML_LIBS) -lrt >X test_shm_CXXFLAGS=$(AM_CXXFLAGS) >2d8381ec91983b57e858891f6094240a >echo x - net-im/ring-daemon/files/patch-src_media_video_v4l2_video__device__monitor__impl.cpp >sed 's/^X//' >net-im/ring-daemon/files/patch-src_media_video_v4l2_video__device__monitor__impl.cpp << '6502c63271e5de38f064af6dff24b7f3' >X--- src/media/video/v4l2/video_device_monitor_impl.cpp.orig 2016-05-10 20:45:50 UTC >X+++ src/media/video/v4l2/video_device_monitor_impl.cpp >X@@ -24,7 +24,10 @@ >X #include <cerrno> >X #include <cstdio> >X #include <cstring> >X+#if !defined(__FreeBSD__) >X #include <libudev.h> >X+#define HAVE_UDEV >X+#endif >X #include <mutex> >X #include <sstream> >X #include <stdexcept> // for std::runtime_error >X@@ -72,24 +75,31 @@ class VideoDeviceMonitorImpl { >X std::thread thread_; >X mutable std::mutex mutex_; >X >X+#if defined(HAVE_UDEV) >X udev *udev_; >X udev_monitor *udev_mon_; >X+#endif >X bool probing_; >X }; >X >X+#if defined(HAVE_UDEV) >X static int is_v4l2(struct udev_device *dev) >X { >X const char *version = udev_device_get_property_value(dev, "ID_V4L_VERSION"); >X /* we do not support video4linux 1 */ >X return version and strcmp(version, "1"); >X } >X+#endif >X >X VideoDeviceMonitorImpl::VideoDeviceMonitorImpl(VideoDeviceMonitor* monitor) : >X monitor_(monitor), >X thread_(), mutex_(), >X+#if defined(HAVE_UDEV) >X udev_(0), udev_mon_(0), >X+#endif >X probing_(false) >X { >X+#if defined(HAVE_UDEV) >X udev_list_entry *devlist; >X udev_enumerate *devenum; >X >X@@ -149,15 +159,16 @@ udev_failed: >X udev_unref(udev_); >X udev_mon_ = NULL; >X udev_ = NULL; >X+#endif >X >X /* fallback : go through /dev/video* */ >X- for (int idx = 0;; ++idx) { >X+ for (int idx = 0; idx<16; ++idx) { >X std::stringstream ss; >X ss << "/dev/video" << idx; >X try { >X monitor_->addDevice(ss.str()); >X } catch (const std::runtime_error &e) { >X- RING_ERR("%s", e.what()); >X+ RING_ERR("%s (YURI exit from constructor)", e.what()); >X return; >X } >X } >X@@ -174,14 +185,17 @@ VideoDeviceMonitorImpl::~VideoDeviceMoni >X probing_ = false; >X if (thread_.joinable()) >X thread_.join(); >X+#if defined(HAVE_UDEV) >X if (udev_mon_) >X udev_monitor_unref(udev_mon_); >X if (udev_) >X udev_unref(udev_); >X+#endif >X } >X >X void VideoDeviceMonitorImpl::run() >X { >X+#if defined(HAVE_UDEV) >X if (!udev_mon_) { >X probing_ = false; >X return; >X@@ -236,6 +250,7 @@ void VideoDeviceMonitorImpl::run() >X return; >X } >X } >X+#endif >X } >X >X VideoDeviceMonitor::VideoDeviceMonitor() : >6502c63271e5de38f064af6dff24b7f3 >echo x - net-im/ring-daemon/files/patch-src_media_video_v4l2_video__device__impl.cpp >sed 's/^X//' >net-im/ring-daemon/files/patch-src_media_video_v4l2_video__device__impl.cpp << '5df1c73045067922d1035454e63b8bea' >X--- src/media/video/v4l2/video_device_impl.cpp.orig 2016-05-14 22:12:11 UTC >X+++ src/media/video/v4l2/video_device_impl.cpp >X@@ -285,7 +285,7 @@ VideoV4l2Size::getRate(FrameRate rate) c >X { >X double r = rate.real(); >X for (const auto& item : rates_) { >X- if (std::fabs(item.frame_rate.real() - r) < 0.0001d) >X+ if (std::fabs(item.frame_rate.real() - r) < 0.0001f) >X return item; >X } >X return rates_.back(); >5df1c73045067922d1035454e63b8bea >echo x - net-im/ring-daemon/files/patch-contrib_src_uuid_rules.mak >sed 's/^X//' >net-im/ring-daemon/files/patch-contrib_src_uuid_rules.mak << '9e66da26c533c39d9c43b9cdd7329a08' >X--- contrib/src/uuid/rules.mak.orig 2016-05-10 20:45:50 UTC >X+++ contrib/src/uuid/rules.mak >X@@ -1,6 +1,6 @@ >X # libuuid part of util-linux >X >X-UUID_VERSION := 1.0.2 >X+UUID_VERSION := 1.0.3 >X UUID_URL := $(SF)/libuuid/libuuid-$(UUID_VERSION).tar.gz >X >X ifeq ($(call need_pkg,"uuid >= 2.0.0"),) >X@@ -8,16 +8,16 @@ PKGS_FOUND += uuid >X endif >X >X $(TARBALLS)/libuuid-$(UUID_VERSION).tar.gz: >X- $(call download,$(UUID_URL)) >X+ #$(call download,$(UUID_URL)) >X >X .sum-uuid: libuuid-$(UUID_VERSION).tar.gz >X >X uuid: libuuid-$(UUID_VERSION).tar.gz .sum-uuid >X- $(UNPACK) >X- $(APPLY) $(SRC)/uuid/android.patch >X- $(MOVE) >X+ #$(UNPACK) >X+ #$(APPLY) $(SRC)/uuid/android.patch >X+ #$(MOVE) >X >X .uuid: uuid >X- cd $< && $(HOSTVARS) ./configure $(HOSTCONF) >X- cd $< && $(MAKE) install >X- touch $@ >X+ #cd $< && $(HOSTVARS) ./configure $(HOSTCONF) >X+ #cd $< && $(MAKE) install >X+ #touch $@ >9e66da26c533c39d9c43b9cdd7329a08 >echo x - net-im/ring-daemon/pkg-plist >sed 's/^X//' >net-im/ring-daemon/pkg-plist << '9340ce0de7c580c3304992a3197bab99' >Xinclude/dring/account_const.h >Xinclude/dring/call_const.h >Xinclude/dring/callmanager_interface.h >Xinclude/dring/configurationmanager_interface.h >Xinclude/dring/dring.h >Xinclude/dring/media_const.h >Xinclude/dring/presencemanager_interface.h >Xinclude/dring/security_const.h >Xinclude/dring/videomanager_interface.h >Xlib/libring.so >Xlib/libring.so.0 >Xlib/libring.so.0.0.0 >Xman/man1/dring.1.gz >Xshare/ring/ringtones/default.wav >Xshare/ring/ringtones/konga.ul >9340ce0de7c580c3304992a3197bab99 >exit >
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 Raw
Actions:
View
Attachments on
bug 209542
:
170345
|
170381
|
170740