Remove net-im/ring-* ports because they depend on custom bundled versions of other packages

So far, Ring upstream is uncooperative and I couldn't get any answers.
Will re-add if this changes.
This commit is contained in:
Yuri Victorovich 2018-03-18 21:08:18 +00:00
parent 42f285a623
commit b904b5354f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=464956
38 changed files with 3 additions and 966 deletions

3
MOVED
View file

@ -10207,3 +10207,6 @@ www/mediawiki128|www/mediawiki130|2018-03-14|Has expired: Upstream no longer mai
sysutils/py-zfs||2018-03-16|Not needed since ZFS 28
net/freebsd-tftp||2018-03-16|Imported into base in FreeBSD 8.0
multimedia/plexpy|multimedia/tautulli|2018-03-17|Project renamed due to copyright infringement
net-im/ring-daemon||2018-03-18|Ring can't build because it depends on custom bundled versions of other packages
net-im/ring-libclient||2018-03-18|Ring can't build because it depends on custom bundled versions of other packages
net-im/ring-gnome||2018-03-18|Ring can't build because it depends on custom bundled versions of other packages

View file

@ -154,9 +154,6 @@
SUBDIR += qxmpp-qt5
SUBDIR += ramblercontacts
SUBDIR += ricochet
SUBDIR += ring-daemon
SUBDIR += ring-gnome
SUBDIR += ring-libclient
SUBDIR += rubygem-earthquake
SUBDIR += rubygem-hipchat
SUBDIR += rubygem-hipchat15

View file

@ -1,85 +0,0 @@
# Created by: Yuri Victorovich <yuri@rawbw.com>
# $FreeBSD$
PORTNAME= ring-daemon
PORTVERSION= 0.160516
DISTVERSIONPREFIX= v
PORTREVISION= 6
CATEGORIES= net-im net-p2p
MAINTAINER= yuri@FreeBSD.org
COMMENT= Daemon part of the Ring VoIP SIP phone and IM
LICENSE= GPLv3
BROKEN= fails to build
DEPRECATED= Broken for more than 6 months
EXPIRATION_DATE= 2018-03-19
BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
LIB_DEPENDS= libyaml-cpp.so:devel/yaml-cpp \
libjsoncpp.so:devel/jsoncpp \
libpcre.so:devel/pcre \
libupnp.so:devel/upnp \
libopendht.so:devel/opendht \
libgnutls.so:security/gnutls \
libavcodec.so:multimedia/ffmpeg \
libpulse.so:audio/pulseaudio \
libsndfile.so:audio/libsndfile \
libsamplerate.so:audio/libsamplerate \
libspeex.so:audio/speex \
libspeexdsp.so:audio/speexdsp \
libuuid.so:misc/e2fsprogs-libuuid
USE_GITHUB= yes
GH_TUPLE+= savoirfairelinux:ring-daemon:56ec56f
GH_TUPLE+= pjsip:pjproject:2.4.5:pj
CONFIGURE_ARGS= --without-gsm \
--enable-video \
--enable-ipv6
USES= autoreconf compiler:c++14-lang gmake libtool pkgconfig
USE_GNOME= glib20 gtk20 cairo gdkpixbuf2
USE_XORG= x11 xscrnsaver
USE_GL= gl
USE_QT5= core gui network xml opengl sql sql-sqlite3_run widgets svg \
concurrent buildtools_build linguisttools_build
GNU_CONFIGURE= yes
MYFLAGS= -I${WRKSRC}/contrib/native/pjproject/pjlib/include -I${LOCALBASE}/include -DPJ_LINUX -I${LOCALBASE}/include/jsoncpp
CFLAGS+= ${MYFLAGS}
CPPFLAGS+= ${MYFLAGS}
CXXFLAGS+= ${MYFLAGS}
USE_LDCONFIG= yes
OPTIONS_DEFINE= DBUS
OPTIONS_DEFAULT=DBUS
DBUS_CONFIGURE_OFF= --without-dbus
DBUS_CONFIGURE_ON= --with-dbus
DBUS_LIB_DEPENDS= \
libdbus-1.so:devel/dbus \
libdbus-c++-1.so:devel/dbus-c++
OPTIONS_SUB= yes
BROKEN_aarch64= Fails to configure: machine arm64-portbld not recognized
.include <bsd.port.pre.mk>
post-extract:
@${MKDIR} ${WRKSRC}/contrib/native
@${MV} ${WRKDIR}/pjproject-2.4.5 ${WRKSRC}/contrib/native/
post-patch:
@${REINPLACE_CMD} -e 's|PJPROJECT_OPTIONS)|PJPROJECT_OPTIONS) CPPFLAGS=-I${LOCALBASE}/include/ CFLAGS="-I${LOCALBASE}/include/ -fPIC"|g' \
${WRKSRC}/contrib/src/pjproject/rules.mak
@${REINPLACE_CMD} -e 's|ringtonePath_ = "/usr/share|ringtonePath_ = "${LOCALBASE}/share|g' \
${WRKSRC}/src/account.cpp
pre-configure:
@(cd ${WRKSRC} && \
${ECHO} "===> Building the custom version of pjsip" && \
cd contrib/native && \
../bootstrap && \
${GMAKE} .pjproject)
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libring.so
.include <bsd.port.post.mk>

View file

@ -1,5 +0,0 @@
TIMESTAMP = 1463424490
SHA256 (savoirfairelinux-ring-daemon-v0.160516-56ec56f_GH0.tar.gz) = 46ef728350b2a8ad1328c2ad805702f26d7bd5af54b7195d364d7f012c33d540
SIZE (savoirfairelinux-ring-daemon-v0.160516-56ec56f_GH0.tar.gz) = 2626013
SHA256 (pjsip-pjproject-2.4.5_GH0.tar.gz) = 3678608de92cb0ed1248464fbeb20af9ddc05c1ad55aea3d40ff8e4ec784c91f
SIZE (pjsip-pjproject-2.4.5_GH0.tar.gz) = 7627091

View file

@ -1,59 +0,0 @@
--- configure.ac.orig 2016-05-10 20:45:50 UTC
+++ configure.ac
@@ -48,6 +48,13 @@ case "${host_os}" in
# Needed for plugin system
LDFLAGS+=" -ldl"
;;
+ freebsd*)
+ SYS=freebsd
+ # Necessary for linking .a to a .so
+ LDFLAGS+=" -Wl,-Bsymbolic"
+ # Needed for plugin system
+ LDFLAGS+=" -ldl"
+ ;;
darwin*)
SYS=darwin
@@ -95,6 +102,7 @@ case "${host_os}" in
esac
AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
AM_CONDITIONAL(HAVE_LINUX, test "${SYS}" = "linux")
+AM_CONDITIONAL(HAVE_FREEBSD, test "${SYS}" = "freebsd")
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1")
AM_CONDITIONAL(HAVE_OSX, test "${HAVE_OSX}" = "1")
@@ -189,10 +197,10 @@ AC_ARG_WITH(contrib,
])
AC_MSG_CHECKING([for 3rd party libraries path])
AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [
- CONTRIB_DIR="${srcdir}/contrib/${host}"
+ CONTRIB_DIR="${srcdir}/contrib/`uname -m`-portbld-freebsd"
AS_IF([test ! -d "${CONTRIB_DIR}"], [
echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
- CONTRIB_DIR="${srcdir}/contrib/`$CC -dumpmachine`"
+ CONTRIB_DIR="${srcdir}/contrib/`uname -m`-portbld-freebsd"
AS_IF([test ! -d "${CONTRIB_DIR}"], [
echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
CONTRIB_DIR=""
@@ -295,7 +303,7 @@ fi
AM_CONDITIONAL(BUILD_ALSA, test "x$with_alsa" = "xyes")
-if test "${SYS}" = "linux"; then
+if test "${SYS}" = "linux" || test "${SYS}" = "freebsd"; then
dnl Check for pulseaudio development package - name: libpulse-dev
LIBPULSE_MIN_VERSION=0.9.15
AC_ARG_WITH([pulse],
@@ -377,9 +385,9 @@ AS_IF([test "x$with_dbus" = "xyes"], [
AC_MSG_ERROR([dbusxx-xml2cpp not found])
fi
- AS_IF([test "x$CLANG" = "xyes"], [
- AC_MSG_ERROR([dbus does not compile when clang is used, rerun with --without-dbus])
- ]);
+ #AS_IF([test "x$CLANG" = "xyes"], [
+ # AC_MSG_ERROR([dbus does not compile when clang is used, rerun with --without-dbus])
+ #]);
AM_CONDITIONAL(RING_DBUS, true)],
AM_CONDITIONAL(RING_DBUS, false));

View file

@ -1,21 +0,0 @@
--- contrib/bootstrap.orig 2016-05-10 20:45:50 UTC
+++ contrib/bootstrap
@@ -74,7 +74,7 @@ done
if test -z "$BUILD"
then
echo -n "Guessing build system... "
- BUILD="`${CC:-cc} -dumpmachine`"
+ BUILD="`uname -m`-portbld-freebsd"
if test -z "$BUILD"; then
echo "FAIL!"
exit 1
@@ -212,6 +212,9 @@ case "${OS}" in
add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
fi
;;
+ *freebsd*)
+ add_make_enabled "HAVE_FREEBSD"
+ ;;
*bsd*)
add_make_enabled "HAVE_BSD"
;;

View file

@ -1,11 +0,0 @@
--- contrib/native/pjproject-2.4.5/aconfigure.orig 2015-08-12 04:46:22 UTC
+++ contrib/native/pjproject-2.4.5/aconfigure
@@ -7158,7 +7158,7 @@ $as_echo "Using OpenH264 prefix... $with
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH264 usability" >&5
$as_echo_n "checking OpenH264 usability... " >&6; }
- OPENH264_LIBS="-lopenh264 -lstdc++"
+ OPENH264_LIBS="-lopenh264"
SAVED_LIBS="$LIBS"
SAVED_LDFLAGS="$LDFLAGS"

View file

@ -1,11 +0,0 @@
--- contrib/native/pjproject-2.4.5/aconfigure.ac.orig 2015-08-12 04:46:22 UTC
+++ contrib/native/pjproject-2.4.5/aconfigure.ac
@@ -1151,7 +1151,7 @@ AC_ARG_ENABLE(openh264,
AC_MSG_CHECKING([OpenH264 usability])
- OPENH264_LIBS="-lopenh264 -lstdc++"
+ OPENH264_LIBS="-lopenh264"
SAVED_LIBS="$LIBS"
SAVED_LDFLAGS="$LDFLAGS"

View file

@ -1,10 +0,0 @@
--- contrib/native/pjproject-2.4.5/build.mak.in.orig 2015-08-12 04:46:22 UTC
+++ contrib/native/pjproject-2.4.5/build.mak.in
@@ -265,7 +265,6 @@ export APP_LDLIBS := $(PJSUA_LIB_LDLIB)
$(PJLIB_LDLIB) \
@LIBS@
export APP_LDXXLIBS := $(PJSUA2_LIB_LDLIB) \
- -lstdc++ \
$(APP_LDLIBS)
# Here are the variabels to use if application is using the library

View file

@ -1,12 +0,0 @@
--- contrib/native/pjproject-2.4.5/pjsip/build/Makefile.orig 2015-08-12 04:46:22 UTC
+++ contrib/native/pjproject-2.4.5/pjsip/build/Makefile
@@ -152,8 +152,7 @@ export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB
$(PJNATH_LDLIB) \
$(PJLIB_UTIL_LDLIB) \
$(PJLIB_LDLIB) \
- $(_LDFLAGS) \
- -lstdc++
+ $(_LDFLAGS)
###############################################################################

View file

@ -1,91 +0,0 @@
--- contrib/src/main.mak.orig 2016-05-10 20:45:50 UTC
+++ contrib/src/main.mak
@@ -78,10 +78,10 @@ endif
#
ifndef HAVE_CROSS_COMPILE
ifneq ($(findstring $(origin CC),undefined default),)
-CC := gcc
+CC := cc
endif
ifneq ($(findstring $(origin CXX),undefined default),)
-CXX := g++
+CXX := c++
endif
ifneq ($(findstring $(origin LD),undefined default),)
LD := ld
@@ -97,10 +97,10 @@ STRIP := strip
endif
else
ifneq ($(findstring $(origin CC),undefined default),)
-CC := $(CROSS_COMPILE)gcc
+CC := $(CROSS_COMPILE)cc
endif
ifneq ($(findstring $(origin CXX),undefined default),)
-CXX := $(CROSS_COMPILE)g++
+CXX := $(CROSS_COMPILE)c++
endif
ifneq ($(findstring $(origin LD),undefined default),)
LD := $(CROSS_COMPILE)ld
@@ -117,8 +117,8 @@ endif
endif
ifdef HAVE_ANDROID
-CC := $(CROSS_COMPILE)gcc --sysroot=$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLATFORM_SHORT_ARCH)
-CXX := $(CROSS_COMPILE)g++ --sysroot=$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLATFORM_SHORT_ARCH)
+CC := $(CROSS_COMPILE)cc --sysroot=$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLATFORM_SHORT_ARCH)
+CXX := $(CROSS_COMPILE)c++ --sysroot=$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLATFORM_SHORT_ARCH)
endif
ifdef HAVE_MACOSX
@@ -256,15 +256,15 @@ else
ZCAT ?= $(error Gunzip client (zcat) not found!)
endif
-ifeq ($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),)
-SHA512SUM = sha512sum --check
-else ifeq ($(shell shasum --version >/dev/null 2>&1 || echo FAIL),)
-SHA512SUM = shasum -a 512 --check
-else ifeq ($(shell openssl version >/dev/null 2>&1 || echo FAIL),)
-SHA512SUM = openssl dgst -sha512
-else
-SHA512SUM = $(error SHA-512 checksumming not found!)
-endif
+#ifeq ($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),)
+#SHA512SUM = sha512sum --check
+#else ifeq ($(shell shasum --version >/dev/null 2>&1 || echo FAIL),)
+#SHA512SUM = shasum -a 512 --check
+#else ifeq ($(shell openssl version >/dev/null 2>&1 || echo FAIL),)
+#SHA512SUM = openssl dgst -sha512
+#else
+#SHA512SUM = $(error SHA-512 checksumming not found!)
+#endif
#
# Common helpers
@@ -320,7 +320,7 @@ checksum = \
"$(SRC)/$(patsubst .sum-%,%,$@)/$(2)SUMS" &&) \
(cd $(TARBALLS) && $(1) /dev/stdin) < \
"$(SRC)/$(patsubst .sum-%,%,$@)/$(2)SUMS"
-CHECK_SHA512 = $(call checksum,$(SHA512SUM),SHA512)
+#CHECK_SHA512 = $(call checksum,$(SHA512SUM),SHA512)
UNPACK = $(RM) -R $@ \
$(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xvzf $(f)) \
$(foreach f,$(filter %.tar.bz2,$^), && tar xvjf $(f)) \
@@ -459,12 +459,12 @@ endif
echo "set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> $@
# Default pattern rules
-.sum-%: $(SRC)/%/SHA512SUMS
- $(CHECK_SHA512)
- touch $@
+#.sum-%: $(SRC)/%/SHA512SUMS
+# $(CHECK_SHA512)
+# touch $@
-.sum-%:
- $(error Download and check target not defined for $*)
+#.sum-%:
+# $(error Download and check target not defined for $*)
# Dummy dependency on found packages
$(patsubst %,.dep-%,$(PKGS_FOUND)): .dep-%:

View file

@ -1,33 +0,0 @@
--- contrib/src/pjproject/rules.mak.orig 2016-05-10 20:45:50 UTC
+++ contrib/src/pjproject/rules.mak
@@ -42,17 +42,17 @@ endif
DEPS_pjproject += gnutls
ifndef HAVE_WIN32
ifndef HAVE_MACOSX
-DEPS_pjproject += uuid
+#DEPS_pjproject += uuid
endif
endif
$(TARBALLS)/pjproject-$(PJPROJECT_VERSION).tar.bz2:
- $(call download,$(PJPROJECT_URL))
+ #$(call download,$(PJPROJECT_URL))
-.sum-pjproject: pjproject-$(PJPROJECT_VERSION).tar.bz2
+#.sum-pjproject: pjproject-$(PJPROJECT_VERSION).tar.bz2
-pjproject: pjproject-$(PJPROJECT_VERSION).tar.bz2 .sum-pjproject
- $(UNPACK)
+pjproject: pjproject-$(PJPROJECT_VERSION).tar.bz2
+ #$(UNPACK)
ifdef HAVE_WIN32
$(APPLY) $(SRC)/pjproject/intptr_t.patch
$(APPLY) $(SRC)/pjproject/pj_win.patch
@@ -68,6 +68,6 @@ endif
$(MOVE)
.pjproject: pjproject
- cd $< && $(HOSTVARS) ./aconfigure $(HOSTCONF) $(PJPROJECT_OPTIONS)
+ cd $< && $(HOSTVARS) ./aconfigure $(HOSTCONF) $(PJPROJECT_OPTIONS) CPPFLAGS=-I/usr/local/include/ CFLAGS="-I/usr/local/include/ -fPIC" CPPFLAGS=-I/usr/local/include/ CFLAGS="-I/usr/local/include/ -fPIC"
cd $< && CFLAGS="$(PJPROJECT_EXTRA_CFLAGS)" $(MAKE) && $(MAKE) install
touch $@

View file

@ -1,34 +0,0 @@
--- contrib/src/uuid/rules.mak.orig 2016-05-10 20:45:50 UTC
+++ contrib/src/uuid/rules.mak
@@ -1,6 +1,6 @@
# libuuid part of util-linux
-UUID_VERSION := 1.0.2
+UUID_VERSION := 1.0.3
UUID_URL := $(SF)/libuuid/libuuid-$(UUID_VERSION).tar.gz
ifeq ($(call need_pkg,"uuid >= 2.0.0"),)
@@ -8,16 +8,16 @@ PKGS_FOUND += uuid
endif
$(TARBALLS)/libuuid-$(UUID_VERSION).tar.gz:
- $(call download,$(UUID_URL))
+ #$(call download,$(UUID_URL))
.sum-uuid: libuuid-$(UUID_VERSION).tar.gz
uuid: libuuid-$(UUID_VERSION).tar.gz .sum-uuid
- $(UNPACK)
- $(APPLY) $(SRC)/uuid/android.patch
- $(MOVE)
+ #$(UNPACK)
+ #$(APPLY) $(SRC)/uuid/android.patch
+ #$(MOVE)
.uuid: uuid
- cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
- cd $< && $(MAKE) install
- touch $@
+ #cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+ #cd $< && $(MAKE) install
+ #touch $@

View file

@ -1,11 +0,0 @@
--- src/Makefile.am.orig 2016-05-10 20:45:50 UTC
+++ src/Makefile.am
@@ -4,7 +4,7 @@ RING_VIDEO_LIBS=
if RING_VIDEO
RING_VIDEO_LIBS+=./media/video/libvideo.la
-if HAVE_LINUX
+if HAVE_FREEBSD
if HAVE_ANDROID
RING_VIDEO_LIBS+= \
./media/video/androidvideo/libandroidvideo.la

View file

@ -1,11 +0,0 @@
--- src/dring/configurationmanager_interface.h.orig 2016-05-10 20:45:50 UTC
+++ src/dring/configurationmanager_interface.h
@@ -31,6 +31,8 @@
#include <string>
#include <cstdint>
+#include <time.h>
+
#include "dring.h"
#include "security_const.h"

View file

@ -1,22 +0,0 @@
--- src/archiver.cpp.orig 2016-05-10 20:45:50 UTC
+++ src/archiver.cpp
@@ -97,7 +97,8 @@ Archiver::exportAccounts(std::vector<std
}
// Encrypt using provided password
- auto encrypted = dht::crypto::aesEncrypt(compressed, password);
+ dht::Blob blob; for (auto c : password) blob.push_back(c);
+ auto encrypted = dht::crypto::aesEncrypt(compressed, blob);
// Write
try {
@@ -151,7 +152,8 @@ Archiver::importAccounts(std::string arc
// Decrypt
try {
- file = dht::crypto::aesDecrypt(file, password);
+ dht::Blob blob; for (auto c : password) blob.push_back(c);
+ file = dht::crypto::aesDecrypt(file, blob);
} catch (const std::exception& ex) {
RING_ERR("Decryption failed: %s", ex.what());
return EPERM;

View file

@ -1,11 +0,0 @@
--- src/media/video/Makefile.am.orig 2016-05-10 20:45:50 UTC
+++ src/media/video/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/globals.mak
SUBDIRS= test
-if HAVE_LINUX
+if HAVE_FREEBSD
if HAVE_ANDROID
SUBDIRS+= \
androidvideo

View file

@ -1,11 +0,0 @@
--- src/media/video/test/Makefile.am.orig 2016-05-10 20:45:50 UTC
+++ src/media/video/test/Makefile.am
@@ -9,7 +9,7 @@ test_video_rtp_LDADD=$(top_builddir)/src
test_video_input_SOURCES=test_video_input.cpp test_video_input.h
test_video_input_LDADD=$(top_builddir)/src/libring.la $(top_builddir)/src/media/video/libvideo.la $(YAML_LIBS)
-if HAVE_LINUX
+if HAVE_FREEBSD
test_shm_SOURCES=test_shm.cpp shm_src.cpp shm_src.h
test_shm_LDADD=$(top_builddir)/src/libring.la $(top_builddir)/src/media/video/libvideo.la $(YAML_LIBS) -lrt
test_shm_CXXFLAGS=$(AM_CXXFLAGS)

View file

@ -1,11 +0,0 @@
--- src/media/video/v4l2/video_device_impl.cpp.orig 2016-05-10 20:45:50 UTC
+++ src/media/video/v4l2/video_device_impl.cpp
@@ -285,7 +285,7 @@ VideoV4l2Size::getRate(FrameRate rate) c
{
double r = rate.real();
for (const auto& item : rates_) {
- if (std::fabs(item.frame_rate.real() - r) < 0.0001d)
+ if (std::fabs(item.frame_rate.real() - r) < 0.0001f)
return item;
}
return rates_.back();

View file

@ -1,90 +0,0 @@
--- src/media/video/v4l2/video_device_monitor_impl.cpp.orig 2016-05-10 20:45:50 UTC
+++ src/media/video/v4l2/video_device_monitor_impl.cpp
@@ -24,7 +24,10 @@
#include <cerrno>
#include <cstdio>
#include <cstring>
+#if !defined(__FreeBSD__)
#include <libudev.h>
+#define HAVE_UDEV
+#endif
#include <mutex>
#include <sstream>
#include <stdexcept> // for std::runtime_error
@@ -72,24 +75,31 @@ class VideoDeviceMonitorImpl {
std::thread thread_;
mutable std::mutex mutex_;
+#if defined(HAVE_UDEV)
udev *udev_;
udev_monitor *udev_mon_;
+#endif
bool probing_;
};
+#if defined(HAVE_UDEV)
static int is_v4l2(struct udev_device *dev)
{
const char *version = udev_device_get_property_value(dev, "ID_V4L_VERSION");
/* we do not support video4linux 1 */
return version and strcmp(version, "1");
}
+#endif
VideoDeviceMonitorImpl::VideoDeviceMonitorImpl(VideoDeviceMonitor* monitor) :
monitor_(monitor),
thread_(), mutex_(),
+#if defined(HAVE_UDEV)
udev_(0), udev_mon_(0),
+#endif
probing_(false)
{
+#if defined(HAVE_UDEV)
udev_list_entry *devlist;
udev_enumerate *devenum;
@@ -149,15 +159,16 @@ udev_failed:
udev_unref(udev_);
udev_mon_ = NULL;
udev_ = NULL;
+#endif
/* fallback : go through /dev/video* */
- for (int idx = 0;; ++idx) {
+ for (int idx = 0; idx<16; ++idx) {
std::stringstream ss;
ss << "/dev/video" << idx;
try {
monitor_->addDevice(ss.str());
} catch (const std::runtime_error &e) {
- RING_ERR("%s", e.what());
+ RING_ERR("%s (YURI exit from constructor)", e.what());
return;
}
}
@@ -174,14 +185,17 @@ VideoDeviceMonitorImpl::~VideoDeviceMoni
probing_ = false;
if (thread_.joinable())
thread_.join();
+#if defined(HAVE_UDEV)
if (udev_mon_)
udev_monitor_unref(udev_mon_);
if (udev_)
udev_unref(udev_);
+#endif
}
void VideoDeviceMonitorImpl::run()
{
+#if defined(HAVE_UDEV)
if (!udev_mon_) {
probing_ = false;
return;
@@ -236,6 +250,7 @@ void VideoDeviceMonitorImpl::run()
return;
}
}
+#endif
}
VideoDeviceMonitor::VideoDeviceMonitor() :

View file

@ -1,5 +0,0 @@
Ring is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power
of privacy in the hands of the user.
WWW: https://ring.cx/

View file

@ -1,17 +0,0 @@
include/dring/account_const.h
include/dring/call_const.h
include/dring/callmanager_interface.h
include/dring/configurationmanager_interface.h
include/dring/dring.h
include/dring/media_const.h
include/dring/presencemanager_interface.h
include/dring/security_const.h
include/dring/videomanager_interface.h
lib/libring.so
lib/libring.so.0
lib/libring.so.0.0.0
man/man1/dring.1.gz
%%DBUS%%sbin/dring
%%DBUS%%share/dbus-1/services/cx.ring.Ring.service
share/ring/ringtones/default.wav
share/ring/ringtones/konga.ul

View file

@ -1,53 +0,0 @@
# Created by: Yuri Victorovich <yuri@rawbw.com>
# $FreeBSD$
PORTNAME= ring-gnome
PORTVERSION= 0.160516
PORTREVISION= 8
#DISTVERSIONPREFIX= v
CATEGORIES= net-im net-p2p
MAINTAINER= yuri@FreeBSD.org
COMMENT= Gnome client of the Ring VoIP SIP phone and IM
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
DEPRECATED= Depends on expiring and broken net-im/ring-daemon
EXPIRATION_DATE= 2018-03-19
LIB_DEPENDS= libringclient.so:net-im/ring-libclient \
libqrencode.so:graphics/libqrencode \
libcogl-pango.so:graphics/cogl \
libclutter-1.0.so:graphics/clutter \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
libnotify.so:devel/libnotify \
libsoup-2.4.so:devel/libsoup \
libplc4.so:devel/nspr \
libjson-glib-1.0.so:devel/json-glib \
libnss3.so:security/nss \
libsecret-1.so:security/libsecret
USE_GITHUB= yes
GH_TUPLE+= savoirfairelinux:ring-client-gnome:07107e9
SUB_FILES= pkg-message
USES= cmake compiler:c++14-lang gettext pkgconfig shebangfix sqlite
USE_GNOME= evolutiondataserver3 glib20 gtk20 cairo gdkpixbuf2 libxml2 gtk30
USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr xscrnsaver
USE_GL= gl egl
USE_QT5= core gui network xml opengl sql sql-sqlite3_run widgets svg \
concurrent buildtools_build linguisttools_build qmake_build
SHEBANG_FILES= ${WRKSRC}/src/ring.cx
INSTALLS_ICONS= yes
OPTIONS_DEFINE= NLS
NLS_CMAKE_ON= -DFREEBSD_NLS_ON:BOOL=ON
OPTIONS_SUB= yes
post-install:
@${GZIP_CMD} ${GZIP} < ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ring.svg > ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ring.svgz
@${RM} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ring.svg
.include <bsd.port.mk>

View file

@ -1,3 +0,0 @@
TIMESTAMP = 1463424510
SHA256 (savoirfairelinux-ring-client-gnome-0.160516-07107e9_GH0.tar.gz) = 14df8601b6520f9040321efb366d33d59a3c139b98acd6b69be0a519e99bdc60
SIZE (savoirfairelinux-ring-client-gnome-0.160516-07107e9_GH0.tar.gz) = 677210

View file

@ -1,30 +0,0 @@
--- CMakeLists.txt.orig 2016-05-06 14:35:17 UTC
+++ CMakeLists.txt
@@ -11,7 +11,7 @@ IF (CMAKE_COMPILER_IS_GNUCC)
ENDIF()
ENDIF()
-ADD_DEFINITIONS("-std=c++1y")
+set(CMAKE_CXX_FLAGS "-std=c++1y")
# set project name and version
PROJECT(ring-client-gnome)
@@ -306,7 +306,10 @@ GLIB_COMPILE_RESOURCES( GLIB_RESOURCES_R
# ADD_SUBDIRECTORY( src/test)
# ENDIF()
+option(FREEBSD_NLS_ON "NLS option: install translations" OFF)
+
# for translations
+IF (FREEBSD_NLS_ON)
IF (GETTEXT_FOUND)
# get all translation files; they're expected to be named using the following convention:
@@ -331,6 +334,7 @@ IF (GETTEXT_FOUND)
ENDFOREACH(PO_FILE)
ENDIF(GETTEXT_FOUND)
+ENDIF(FREEBSD_NLS_ON)
# install and compile glib gsettings schema
add_schema("cx.ring.RingGnome.gschema.xml" GSCHEMA_RING)

View file

@ -1,10 +0,0 @@
======================================================================
You installed the Ring softphone and IM Gnome client.
Ring is currently in beta, and might not always function as expected.
It will only work when pulseaudio server is running.
For video to work you need to make sure that your webcam is available
through the V4L interface.
======================================================================

View file

@ -1,5 +0,0 @@
Ring is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power
of privacy in the hands of the user.
WWW: https://ring.cx/

View file

@ -1,34 +0,0 @@
bin/gnome-ring
bin/ring.cx
share/appdata/gnome-ring.appdata.xml
share/applications/gnome-ring.desktop
share/glib-2.0/schemas/cx.ring.RingGnome.gschema.xml
share/gnome-ring/gnome-ring.desktop
share/icons/hicolor/scalable/apps/ring.svgz
%%NLS%%share/locale/ar/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/bg/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/ca/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/cs_CZ/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/da_DK/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/de/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/eo/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/es/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/fa_IR/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/fr/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/fr_CA/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/he/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/hr/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/id/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/lt/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/nl/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/pa/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/pl/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/pt/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/ru/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/ru_RU/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/sv/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/tr/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/uk/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/zh/LC_MESSAGES/ring-client-gnome.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/ring-client-gnome.mo

View file

@ -1,37 +0,0 @@
# Created by: Yuri Victorovich <yuri@rawbw.com>
# $FreeBSD$
PORTNAME= ring-libclient
PORTVERSION= 0.160516
PORTREVISION= 4
#DISTVERSIONPREFIX= v
CATEGORIES= net-im net-p2p
MAINTAINER= yuri@FreeBSD.org
COMMENT= Client library for the Ring VoIP SIP phone and IM
LICENSE= GPLv3
DEPRECATED= Depends on expiring and broken net-im/ring-daemon
EXPIRATION_DATE= 2018-03-19
LIB_DEPENDS= libring.so:net-im/ring-daemon
USE_GITHUB= yes
#GH_TUPLE+= savoirfairelinux:ring-lrc:9eaac77
GH_TUPLE+= savoirfairelinux:ring-lrc:cb5ee04
USES= cmake compiler:c++14-lang
USE_GNOME= glib20 gtk20 cairo gdkpixbuf2
USE_XORG= x11 xscrnsaver
USE_GL= gl
USE_QT5= core gui network xml opengl sql sql-sqlite3_run widgets svg \
concurrent buildtools_build linguisttools_build qmake_build
USE_LDCONFIG= yes
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
OPTIONS_DEFINE= NLS
NLS_CMAKE_ON= -DFREEBSD_NLS_ON:BOOL=ON
OPTIONS_SUB= yes
.include <bsd.port.mk>

View file

@ -1,3 +0,0 @@
TIMESTAMP = 1464118610
SHA256 (savoirfairelinux-ring-lrc-0.160516-cb5ee04_GH0.tar.gz) = c00c27ebc461091adff923820e384bbe07078fc2266f505a3ec01066933a8592
SIZE (savoirfairelinux-ring-lrc-0.160516-cb5ee04_GH0.tar.gz) = 499643

View file

@ -1,21 +0,0 @@
--- CMakeLists.txt.orig 2016-05-19 17:41:40 UTC
+++ CMakeLists.txt
@@ -751,7 +751,10 @@ INSTALL( FILES ${libringclient_CONFIG_PA
# COMPATIBILITY SameMajorVersion
# )
+option(FREEBSD_NLS_ON "NLS option: install translations" OFF)
+
# translations
+IF( FREEBSD_NLS_ON )
IF( Qt5LinguistTools_FOUND )
# translation template file
SET(TS_TEMPLATE ${CMAKE_SOURCE_DIR}/translations/lrc_en.ts)
@@ -767,6 +770,7 @@ IF( Qt5LinguistTools_FOUND )
INSTALL(FILES ${QM_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/libringclient/translations")
ENDIF()
+ENDIF()
# uninstall target
CONFIGURE_FILE(

View file

@ -1,12 +0,0 @@
--- src/account.h.orig 2016-05-19 17:41:40 UTC
+++ src/account.h
@@ -24,6 +24,9 @@
//Qt
class QString;
+//FreeBSD
+#include <time.h>
+
//Ring
#include "itembase.h"
#include "keyexchangemodel.h"

View file

@ -1,11 +0,0 @@
--- src/localringtonecollection.cpp.orig 2016-05-19 17:41:40 UTC
+++ src/localringtonecollection.cpp
@@ -115,7 +115,7 @@ bool LocalRingtoneCollection::load()
qWarning() << "Ringtones doesn't exist or is not readable";
//TODO remove that and do a proper collection for each platforms
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
QDir ringtonesDir(QFileInfo(QCoreApplication::applicationFilePath()).path()+"/../share/ring/ringtones/");
#elif defined(Q_OS_WIN)
QDir ringtonesDir(QFileInfo(QCoreApplication::applicationFilePath()).path()+"/ringtones/");

View file

@ -1,11 +0,0 @@
--- src/phonedirectorymodel.h.orig 2016-05-29 04:15:59 UTC
+++ src/phonedirectorymodel.h
@@ -19,6 +19,8 @@
#include "typedefs.h"
+#include <time.h>
+
//Qt
#include <QtCore/QString>
#include <QtCore/QAbstractTableModel>

View file

@ -1,12 +0,0 @@
--- src/private/textrecording_p.h.orig 2016-05-29 04:18:08 UTC
+++ src/private/textrecording_p.h
@@ -25,6 +25,9 @@
//Daemon
#include <account_const.h>
+//FreeBSD
+#include <time.h>
+
//Ring
#include "media/media.h"
#include "media/textrecording.h"

View file

@ -1,11 +0,0 @@
--- src/trustrequest.h.orig 2016-05-29 04:14:51 UTC
+++ src/trustrequest.h
@@ -20,6 +20,8 @@
#include <QtCore/QObject>
#include <typedefs.h>
+#include <time.h>
+
class TrustRequestPrivate;
class AccountModel;
class AccountModelPrivate;

View file

@ -1,5 +0,0 @@
Ring is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power
of privacy in the hands of the user.
WWW: https://ring.cx/

View file

@ -1,144 +0,0 @@
include/libringclient/account.h
include/libringclient/accountlistcolorizerdefault.h
include/libringclient/accountmodel.h
include/libringclient/accountstatusmodel.h
include/libringclient/audio/alsapluginmodel.h
include/libringclient/audio/inputdevicemodel.h
include/libringclient/audio/managermodel.h
include/libringclient/audio/outputdevicemodel.h
include/libringclient/audio/ringtonedevicemodel.h
include/libringclient/audio/settings.h
include/libringclient/availableaccountmodel.h
include/libringclient/bootstrapmodel.h
include/libringclient/call.h
include/libringclient/call.hpp
include/libringclient/callmodel.h
include/libringclient/categorizedbookmarkmodel.h
include/libringclient/categorizedcontactmodel.h
include/libringclient/categorizedhistorymodel.h
include/libringclient/certificate.h
include/libringclient/certificatemodel.h
include/libringclient/chainoftrustmodel.h
include/libringclient/ciphermodel.h
include/libringclient/codecmodel.h
include/libringclient/collectionconfigurationinterface.h
include/libringclient/collectioncreationinterface.h
include/libringclient/collectioneditor.h
include/libringclient/collectioneditor.hpp
include/libringclient/collectionextensioninterface.h
include/libringclient/collectionextensionmodel.h
include/libringclient/collectionextensionmodel.hpp
include/libringclient/collectioninterface.h
include/libringclient/collectioninterface.hpp
include/libringclient/collectionmanagerinterface.h
include/libringclient/collectionmanagerinterface.hpp
include/libringclient/collectionmediator.h
include/libringclient/collectionmediator.hpp
include/libringclient/collectionmodel.h
include/libringclient/contactmethod.h
include/libringclient/credential.h
include/libringclient/credentialmodel.h
include/libringclient/daemoncertificatecollection.h
include/libringclient/dbuserrorhandlerdefault.h
include/libringclient/extensions/presencecollectionextension.h
include/libringclient/extensions/securityevaluationextension.h
include/libringclient/fallbackpersoncollection.h
include/libringclient/foldercertificatecollection.h
include/libringclient/globalinstances.h
include/libringclient/historytimecategorymodel.h
include/libringclient/hookmanager.h
include/libringclient/interfaces/accountlistcolorizeri.h
include/libringclient/interfaces/actionextenderi.h
include/libringclient/interfaces/contactmethodselectori.h
include/libringclient/interfaces/dbuserrorhandleri.h
include/libringclient/interfaces/itemmodelstateserializeri.h
include/libringclient/interfaces/pixmapmanipulatori.h
include/libringclient/interfaces/presenceserializeri.h
include/libringclient/interfaces/shortcutcreatori.h
include/libringclient/itembase.h
include/libringclient/itembase.hpp
include/libringclient/itemdataroles.h
include/libringclient/keyexchangemodel.h
include/libringclient/lastusednumbermodel.h
include/libringclient/localbookmarkcollection.h
include/libringclient/localhistorycollection.h
include/libringclient/localmacrocollection.h
include/libringclient/localprofilecollection.h
include/libringclient/localrecordingcollection.h
include/libringclient/localringtonecollection.h
include/libringclient/localtextrecordingcollection.h
include/libringclient/macro.h
include/libringclient/macromodel.h
include/libringclient/media/audio.h
include/libringclient/media/avrecording.h
include/libringclient/media/file.h
include/libringclient/media/media.h
include/libringclient/media/recording.h
include/libringclient/media/recordingmodel.h
include/libringclient/media/text.h
include/libringclient/media/textrecording.h
include/libringclient/media/video.h
include/libringclient/mime.h
include/libringclient/networkinterfacemodel.h
include/libringclient/numbercategory.h
include/libringclient/numbercategorymodel.h
include/libringclient/numbercompletionmodel.h
include/libringclient/peerprofilecollection.h
include/libringclient/pendingtrustrequestmodel.h
include/libringclient/person.h
include/libringclient/personmodel.h
include/libringclient/phonedirectorymodel.h
include/libringclient/pixmapmanipulatordefault.h
include/libringclient/presenceserializerdefault.h
include/libringclient/presencestatusmodel.h
include/libringclient/profile.h
include/libringclient/profilemodel.h
include/libringclient/protocolmodel.h
include/libringclient/recentmodel.h
include/libringclient/ringtone.h
include/libringclient/ringtonemodel.h
include/libringclient/securityevaluationmodel.h
include/libringclient/securityflaw.h
include/libringclient/shortcutcreatordefault.h
include/libringclient/tlsmethodmodel.h
include/libringclient/transitionalpersonbackend.h
include/libringclient/trustrequest.h
include/libringclient/typedefs.h
include/libringclient/uri.h
include/libringclient/useractionmodel.h
include/libringclient/video/channel.h
include/libringclient/video/configurationproxy.h
include/libringclient/video/device.h
include/libringclient/video/devicemodel.h
include/libringclient/video/previewmanager.h
include/libringclient/video/rate.h
include/libringclient/video/renderer.h
include/libringclient/video/resolution.h
include/libringclient/video/sourcemodel.h
lib/cmake/LibRingClient/LibRingClientConfig.cmake
lib/libringclient.so
lib/libringclient.so.1.0.0
%%NLS%%share/libringclient/translations/lrc_ar.qm
%%NLS%%share/libringclient/translations/lrc_bg.qm
%%NLS%%share/libringclient/translations/lrc_ca.qm
%%NLS%%share/libringclient/translations/lrc_cs_CZ.qm
%%NLS%%share/libringclient/translations/lrc_da_DK.qm
%%NLS%%share/libringclient/translations/lrc_de.qm
%%NLS%%share/libringclient/translations/lrc_eo.qm
%%NLS%%share/libringclient/translations/lrc_es.qm
%%NLS%%share/libringclient/translations/lrc_fa_IR.qm
%%NLS%%share/libringclient/translations/lrc_fr.qm
%%NLS%%share/libringclient/translations/lrc_he.qm
%%NLS%%share/libringclient/translations/lrc_hr.qm
%%NLS%%share/libringclient/translations/lrc_id.qm
%%NLS%%share/libringclient/translations/lrc_lt.qm
%%NLS%%share/libringclient/translations/lrc_pl.qm
%%NLS%%share/libringclient/translations/lrc_pt.qm
%%NLS%%share/libringclient/translations/lrc_pt_BR.qm
%%NLS%%share/libringclient/translations/lrc_ru.qm
%%NLS%%share/libringclient/translations/lrc_ru_RU.qm
%%NLS%%share/libringclient/translations/lrc_sv.qm
%%NLS%%share/libringclient/translations/lrc_tr.qm
%%NLS%%share/libringclient/translations/lrc_uk.qm
%%NLS%%share/libringclient/translations/lrc_zh.qm
%%NLS%%share/libringclient/translations/lrc_zh_CN.qm