Attachment #230898 for bug #261103




# Created by: Rozhuk Ivan

PORTNAME=		libaravis
DISTVERSION=		0.8.20
DISTVERSION=		0_5_12
CATEGORIES=		devel

MAINTAINER=		rozhuk.im@gmail.com

LICENSE=		LGPL21+
LICENSE_FILE=		${WRKSRC}/COPYING

BUILD_DEPENDS=		g-ir-compiler:devel/gobject-introspection

CONFLICTS_INSTALL=	${PORTNAME}*

USES=			gnome libtool meson pkgconfig
USE_GITHUB=		yes
GH_ACCOUNT=		AravisProject
GH_PROJECT=		aravis
USE_GNOME=		glib20 intltool libxml2
GNU_CONFIGURE=		yes
USE_LDCONFIG=		yes
INSTALL_TARGET=		install-strip
#CFLAGS+=		-D__APPLE__ -D__MACH__

MESON_ARGS=		-Dpacket-socket=disabled -Dviewer=disabled	\
			-Dgst-plugin=disabled -Dtests=false
			--enable-cpp-test=no --enable-zlib-pc=yes
MAKE_ARGS=		pkgconfigdir="${PREFIX}/libdata/pkgconfig"

DOCSDIR=		${PREFIX}/share/gtk-doc/html/aravis-0.8

OPTIONS_DEFINE=		DOCS GIR NLS FAST_HEARTBEAT USB
OPTIONS_DEFAULT=	USB
OPTIONS_SUB=		yes

DOCS_MESON_ENABLED=	documentation
DOCS_BUILD_DEPENDS=	gtkdoc-scan:textproc/gtk-doc

GIR_DESC=		Build Gobject Introspection
GIR_USE=		GNOME=introspection:build
GIR_MESON_ENABLED=	introspection

NLS_USES=		gettext

FAST_HEARTBEAT_DESC=	build with extremely fast heartbeat
FAST_HEARTBEAT_MESON_TRUE=	fast-heartbeat

USB_DESC=		build with USB support
USB_MESON_ENABLED=	usb

pre-configure:
	@${ECHO_CMD} "EXTRA_DIST =" >> ${WRKSRC}/gtk-doc.make

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/devel/libaravis/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1526105762	1	TIMESTAMP = 1641824435
2	SHA256 (AravisProject-aravis-ARAVIS_0_5_12_GH0.tar.gz) = 61467edecb96f7d315770f8d874860e42b2981200edb8bba879f46ec9a83e0b2	2	SHA256 (AravisProject-aravis-0.8.20_GH0.tar.gz) = d8d15970a08538f1c61372a378750451c03856184b60dd6d8c657dca23690135
3	SIZE (AravisProject-aravis-ARAVIS_0_5_12_GH0.tar.gz) = 2986578	3	SIZE (AravisProject-aravis-0.8.20_GH0.tar.gz) = 950371




--- Makefile.am.orig	2018-01-29 16:03:28 UTC
+++ Makefile.am
@@ -6,7 +6,7 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc --enable-gst-plugin --enable-gst-0.10-plugin --enable-viewer --enable-cpp-test --enable-appstream-util
 
-SUBDIRS = src man
+SUBDIRS = src 
 
 if ARAVIS_BUILD_VIEWER
 SUBDIRS += viewer
@@ -20,7 +20,7 @@ if ARAVIS_BUILD_GST_0_10_PLUGIN
 SUBDIRS += gst-0.10
 endif
 
-SUBDIRS += tests po docs
+SUBDIRS += po docs
 
 aravisdocdir = ${docdir}/aravis-@ARAVIS_API_VERSION@
 aravisdoc_DATA = 	\

Removed Link Here

(-)a/devel/libaravis/files/patch-configure.ac (-11 lines)
1	--- configure.ac.orig 2018-01-29 16:03:28 UTC
2	+++ configure.ac
3	@@ -268,7 +268,7 @@ GOBJECT_INTROSPECTION_CHECK([0.10.0])
4	AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
5	enable_introspection=no])
6
7	-GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
8	+
9	AM_CONDITIONAL([BUILD_GTK_DOC], [test "x$enable_gtk_doc" = "xyes" \|\| test ! -f "autogen.sh"])
10
11	APPSTREAM_XML




--- src/arvgvdevice.c.orig	2017-04-10 13:30:09 UTC
+++ src/arvgvdevice.c
@@ -20,6 +20,8 @@
  * @short_description: GigEVision device
  */
 
+#include <sys/param.h>
+
 #include <arvgvdeviceprivate.h>
 #include <arvdeviceprivate.h>
 #include <arvgc.h>
@@ -36,9 +38,14 @@
 #include <arvenumtypes.h>
 #include <string.h>
 #include <stdlib.h>
-#ifndef __APPLE__
+#ifdef __linux__
 #include <linux/ip.h>
 #endif
+#ifdef BSD
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#define iphdr	ip
+#endif
 #include <netinet/udp.h>
 
 static GObjectClass *parent_class = NULL;

Removed Link Here

(-)a/devel/libaravis/files/patch-src_arvgvinterface.c (-10 lines)
1	--- src/arvgvinterface.c.orig 2017-04-10 13:30:09 UTC
2	+++ src/arvgvinterface.c
3	@@ -38,6 +38,7 @@
4	#include <sys/types.h>
5	#include <sys/socket.h>
6	#include <net/if.h>
7	+#include <netinet/in.h>
8	#include <netdb.h>
9	#include <ifaddrs.h>
10	#include <stdlib.h>




--- src/arvnetwork.c	2021-12-16 12:21:48.000000000 +0300
+++ src/arvnetwork.c	2022-01-11 09:09:41.448763000 +0300
@@ -354,6 +354,10 @@
 		return NULL;
 
 	for (ifap_iter = ifap; ifap_iter != NULL; ifap_iter = ifap_iter->ifa_next) {
+#ifdef IFF_BROADCAST
+		if ((ifap_iter->ifa_flags & IFF_BROADCAST) == 0)
+			continue; /* Skip interfaces without broadcast. */
+#endif
 		if ((ifap_iter->ifa_flags & IFF_UP) != 0 &&
 			(ifap_iter->ifa_flags & IFF_POINTOPOINT) == 0 &&
 			(ifap_iter->ifa_addr != NULL) &&
@@ -367,6 +371,10 @@
 				a->netmask = arv_memdup (ifap_iter->ifa_netmask, sizeof(struct sockaddr));
 #if defined(__APPLE__) && defined(__MACH__)
 			if (ifap_iter->ifa_broadaddr)
+				a->broadaddr = arv_memdup(ifap_iter->ifa_broadaddr, sizeof(struct sockaddr));
+#elif defined(BSD)
+			if (ifap_iter->ifa_broadaddr &&
+			    ifap_iter->ifa_broadaddr->sa_len != 0)
 				a->broadaddr = arv_memdup(ifap_iter->ifa_broadaddr, sizeof(struct sockaddr));
 #else
 			if (ifap_iter->ifa_ifu.ifu_broadaddr)




--- src/arvnetworkprivate.h	2021-12-16 12:21:48.000000000 +0300
+++ src/arvnetworkprivate.h	2022-01-11 09:06:56.451339000 +0300
@@ -24,6 +24,8 @@
 #ifndef ARV_NETWORK_PRIVATE_H
 #define ARV_NETWORK_PRIVATE_H
 
+#include <sys/param.h>
+
 #include <arvapi.h>
 
 #include <gio/gnetworking.h>
@@ -38,8 +40,14 @@
 #include <netinet/in.h>
 #endif
 
-#if !defined(__APPLE__) && !defined(G_OS_WIN32)
+#ifdef __linux__
 #include <linux/ip.h>
+#endif
+
+#ifdef BSD
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#define iphdr ip
 #endif
 
 #ifndef G_OS_WIN32




--- src/arvrealtime.c	2021-12-16 12:21:48.000000000 +0300
+++ src/arvrealtime.c	2022-01-11 09:15:09.398438000 +0300
@@ -27,6 +27,8 @@
 
 */
 
+#include <sys/param.h>
+
 #include <arvrealtimeprivate.h>
 #include <arvdebugprivate.h>
 #include <memory.h>
@@ -40,7 +42,7 @@
 #include <sys/types.h>
 #endif
 
-#if !defined(__APPLE__) && !defined(G_OS_WIN32)
+#if !defined(__APPLE__) && !defined(G_OS_WIN32) && !defined(BSD)
         return (pid_t) syscall(SYS_gettid);
+#endif
+#ifdef BSD
+        return (pid_t) pthread_self();
+#endif
 }
 
 #define RTKIT_SERVICE_NAME "org.freedesktop.RealtimeKit1"
 #define RTKIT_OBJECT_PATH "/org/freedesktop/RealtimeKit1"




bin/arv-camera-test-0.8
bin/arv-fake-gv-camera-0.8
bin/arv-test-0.8
bin/arv-tool-0.8
include/aravis-0.8/arv.h
include/aravis-0.8/arvapi.h
include/aravis-0.8/arvbuffer.h
include/aravis-0.8/arvcamera.h
include/aravis-0.8/arvchunkparser.h
include/aravis-0.8/arvdebug.h
include/aravis-0.8/arvdevice.h
include/aravis-0.8/arvdomcharacterdata.h
include/aravis-0.8/arvdomdocument.h
include/aravis-0.8/arvdomdocumentfragment.h
include/aravis-0.8/arvdomelement.h
include/aravis-0.8/arvdomimplementation.h
include/aravis-0.8/arvdomnamednodemap.h
include/aravis-0.8/arvdomnode.h
include/aravis-0.8/arvdomnodechildlist.h
include/aravis-0.8/arvdomnodelist.h
include/aravis-0.8/arvdomparser.h
include/aravis-0.8/arvdomtext.h
include/aravis-0.8/arvenums.h
include/aravis-0.8/arvevaluator.h
include/aravis-0.8/arvfakecamera.h
include/aravis-0.8/arvfakedevice.h
include/aravis-0.8/arvfakeinterface.h
include/aravis-0.8/arvfakestream.h
include/aravis-0.8/arvfeatures.h
include/aravis-0.8/arvgc.h
include/aravis-0.8/arvgcboolean.h
include/aravis-0.8/arvgccategory.h
include/aravis-0.8/arvgccommand.h
include/aravis-0.8/arvgcconverter.h
include/aravis-0.8/arvgcconverternode.h
include/aravis-0.8/arvgcenumentry.h
include/aravis-0.8/arvgcenumeration.h
include/aravis-0.8/arvgcenums.h
include/aravis-0.8/arvgcfeaturenode.h
include/aravis-0.8/arvgcfloat.h
include/aravis-0.8/arvgcfloatnode.h
include/aravis-0.8/arvgcfloatregnode.h
include/aravis-0.8/arvgcgroupnode.h
include/aravis-0.8/arvgcindexnode.h
include/aravis-0.8/arvgcintconverternode.h
include/aravis-0.8/arvgcinteger.h
include/aravis-0.8/arvgcintegernode.h
include/aravis-0.8/arvgcintregnode.h
include/aravis-0.8/arvgcintswissknifenode.h
include/aravis-0.8/arvgcinvalidatornode.h
include/aravis-0.8/arvgcmaskedintregnode.h
include/aravis-0.8/arvgcnode.h
include/aravis-0.8/arvgcport.h
include/aravis-0.8/arvgcpropertynode.h
include/aravis-0.8/arvgcregister.h
include/aravis-0.8/arvgcregisterdescriptionnode.h
include/aravis-0.8/arvgcregisternode.h
include/aravis-0.8/arvgcselector.h
include/aravis-0.8/arvgcstring.h
include/aravis-0.8/arvgcstringnode.h
include/aravis-0.8/arvgcstringregnode.h
include/aravis-0.8/arvgcstructentrynode.h
include/aravis-0.8/arvgcstructregnode.h
include/aravis-0.8/arvgcswissknife.h
include/aravis-0.8/arvgcswissknifenode.h
include/aravis-0.8/arvgcvalueindexednode.h
include/aravis-0.8/arvgvdevice.h
include/aravis-0.8/arvgvfakecamera.h
include/aravis-0.8/arvgvinterface.h
include/aravis-0.8/arvgvstream.h
include/aravis-0.8/arvinterface.h
include/aravis-0.8/arvmisc.h
include/aravis-0.8/arvrealtime.h
include/aravis-0.8/arvstr.h
include/aravis-0.8/arvstream.h
include/aravis-0.8/arvsystem.h
include/aravis-0.8/arvtypes.h
include/aravis-0.8/arvuvdevice.h
include/aravis-0.8/arvuvinterface.h
include/aravis-0.8/arvuvstream.h
include/aravis-0.8/arvversion.h
include/aravis-0.8/arvxmlschema.h
include/aravis-0.8/arvzip.h
%%GIR%%lib/girepository-1.0/Aravis-0.8.typelib
lib/libaravis-0.8.so
lib/libaravis-0.8.so.0
lib/libaravis-0.8.so.0.8.20
libdata/pkgconfig/aravis-0.8.pc
%%PORTDOCS%%man/man1/arv-tool-0.8.1.gz
%%GIR%%share/gir-1.0/Aravis-0.8.gir
%%PORTDOCS%%%%DOCSDIR%%/ArvBuffer.html
%%PORTDOCS%%%%DOCSDIR%%/ArvCamera.html
%%PORTDOCS%%%%DOCSDIR%%/ArvChunkParser.html
%%PORTDOCS%%%%DOCSDIR%%/ArvDevice.html
%%PORTDOCS%%%%DOCSDIR%%/ArvDomCharacterData.html
%%PORTDOCS%%%%DOCSDIR%%/ArvDomDocument.html
%%PORTDOCS%%%%DOCSDIR%%/ArvDomDocumentFragment.html
%%PORTDOCS%%%%DOCSDIR%%/ArvDomElement.html
%%PORTDOCS%%%%DOCSDIR%%/ArvDomNamedNodeMap.html
%%PORTDOCS%%%%DOCSDIR%%/ArvDomNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvDomNodeChildList.html
%%PORTDOCS%%%%DOCSDIR%%/ArvDomNodeList.html
%%PORTDOCS%%%%DOCSDIR%%/ArvDomText.html
%%PORTDOCS%%%%DOCSDIR%%/ArvEvaluator.html
%%PORTDOCS%%%%DOCSDIR%%/ArvFakeCamera.html
%%PORTDOCS%%%%DOCSDIR%%/ArvFakeDevice.html
%%PORTDOCS%%%%DOCSDIR%%/ArvFakeInterface.html
%%PORTDOCS%%%%DOCSDIR%%/ArvFakeStream.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGc.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcBoolean.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcCategory.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcCommand.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcConverter.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcConverterNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcEnumEntry.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcEnumeration.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcFeatureNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcFloat.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcFloatNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcGroupNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcIndexNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcIntConverterNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcInteger.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcIntegerNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcInvalidatorNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcPort.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcPropertyNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcRegister.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcRegisterDescriptionNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcRegisterNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcSelector.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcString.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcStringNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcStructEntryNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcSwissKnife.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGcValueIndexedNode.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGvDevice.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGvFakeCamera.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGvInterface.html
%%PORTDOCS%%%%DOCSDIR%%/ArvGvStream.html
%%PORTDOCS%%%%DOCSDIR%%/ArvInterface.html
%%PORTDOCS%%%%DOCSDIR%%/ArvStream.html
%%PORTDOCS%%%%DOCSDIR%%/ArvUvDevice.html
%%PORTDOCS%%%%DOCSDIR%%/ArvUvInterface.html
%%PORTDOCS%%%%DOCSDIR%%/ArvUvStream.html
%%PORTDOCS%%%%DOCSDIR%%/ArvXmlSchema.html
%%PORTDOCS%%%%DOCSDIR%%/annotation-glossary.html
%%PORTDOCS%%%%DOCSDIR%%/aravis-Arv.html
%%PORTDOCS%%%%DOCSDIR%%/aravis-ArvDebug.html
%%PORTDOCS%%%%DOCSDIR%%/aravis-ArvGst.html
%%PORTDOCS%%%%DOCSDIR%%/aravis-ArvStr.html
%%PORTDOCS%%%%DOCSDIR%%/aravis-ArvZip.html
%%PORTDOCS%%%%DOCSDIR%%/aravis-building.html
%%PORTDOCS%%%%DOCSDIR%%/aravis-gv-introduction.html
%%PORTDOCS%%%%DOCSDIR%%/aravis-gv.html
%%PORTDOCS%%%%DOCSDIR%%/aravis-gvcp.html
%%PORTDOCS%%%%DOCSDIR%%/aravis-gvsp.html
%%PORTDOCS%%%%DOCSDIR%%/aravis-introduction.html
%%PORTDOCS%%%%DOCSDIR%%/aravis-overview.html
%%PORTDOCS%%%%DOCSDIR%%/aravis-reference.html
%%PORTDOCS%%%%DOCSDIR%%/aravis.devhelp2
%%PORTDOCS%%%%DOCSDIR%%/ch04.html
%%PORTDOCS%%%%DOCSDIR%%/ch05.html
%%PORTDOCS%%%%DOCSDIR%%/ch06.html
%%PORTDOCS%%%%DOCSDIR%%/ch07.html
%%PORTDOCS%%%%DOCSDIR%%/ch08.html
%%PORTDOCS%%%%DOCSDIR%%/ch09.html
%%PORTDOCS%%%%DOCSDIR%%/ch10.html
%%PORTDOCS%%%%DOCSDIR%%/ch11.html
%%PORTDOCS%%%%DOCSDIR%%/home.png
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/ix01.html
%%PORTDOCS%%%%DOCSDIR%%/ix02.html
%%PORTDOCS%%%%DOCSDIR%%/ix03.html
%%PORTDOCS%%%%DOCSDIR%%/ix04.html
%%PORTDOCS%%%%DOCSDIR%%/ix05.html
%%PORTDOCS%%%%DOCSDIR%%/ix06.html
%%PORTDOCS%%%%DOCSDIR%%/ix07.html
%%PORTDOCS%%%%DOCSDIR%%/ix08.html
%%PORTDOCS%%%%DOCSDIR%%/ix09.html
%%PORTDOCS%%%%DOCSDIR%%/ix10.html
%%PORTDOCS%%%%DOCSDIR%%/ix11.html
%%PORTDOCS%%%%DOCSDIR%%/ix12.html
%%PORTDOCS%%%%DOCSDIR%%/ix13.html
%%PORTDOCS%%%%DOCSDIR%%/ix14.html
%%PORTDOCS%%%%DOCSDIR%%/ix15.html
%%PORTDOCS%%%%DOCSDIR%%/ix16.html
%%PORTDOCS%%%%DOCSDIR%%/left-insensitive.png
%%PORTDOCS%%%%DOCSDIR%%/left.png
%%PORTDOCS%%%%DOCSDIR%%/right-insensitive.png
%%PORTDOCS%%%%DOCSDIR%%/right.png
%%PORTDOCS%%%%DOCSDIR%%/style.css
%%PORTDOCS%%%%DOCSDIR%%/thread-safety.html
%%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png
%%PORTDOCS%%%%DOCSDIR%%/up.png




# Created by: Rozhuk Ivan rozhuk.im@gmail.com

PORTNAME=		aravis
DISTVERSION=		0.8.20
DISTVERSION=		0_5_12
CATEGORIES=		multimedia

MAINTAINER=		rozhuk.im@gmail.com


CONFLICTS_INSTALL=	${PORTNAME}*

LIB_DEPENDS+=		libaravis-0.8.so:devel/libaravis \
			libnotify.so:devel/libnotify

USES=			gnome libtool meson pkgconfig
USE_GNOME=		cairo glib20 intltool gtk30
USE_GSTREAMER1=		yes
GNU_CONFIGURE=		yes
# USE_LDCONFIG=		yes

USE_GITHUB=		yes
GH_ACCOUNT=		AravisProject

MESON_ARGS=		-Dpacket-socket=disabled -Dviewer=enabled	\
			-Ddocumentation=disabled -Dintrospection=disabled \
			-Dgst-plugin=disabled -Dtests=false -Dusb=disabled

post-patch:
	@${REINPLACE_CMD} -e "s|subdir ('src')|aravis_dependencies += dependency ('aravis-0.8', version: '>=0.8', required: true)|g" \
		-e 's|meson.override_dependency.*||g' \
		${WRKSRC}/meson.build
	@${REINPLACE_CMD} -e "s|.*aravis_library.*||g" \
		-e "s|library_inc|include_directories('../src')|g" \
		${WRKSRC}/viewer/meson.build
		${WRKSRC}/viewer/Makefile.am

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/multimedia/aravis/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1526106632	1	TIMESTAMP = 1641829020
2	SHA256 (AravisProject-aravis-ARAVIS_0_5_12_GH0.tar.gz) = 61467edecb96f7d315770f8d874860e42b2981200edb8bba879f46ec9a83e0b2	2	SHA256 (AravisProject-aravis-0.8.20_GH0.tar.gz) = d8d15970a08538f1c61372a378750451c03856184b60dd6d8c657dca23690135
3	SIZE (AravisProject-aravis-ARAVIS_0_5_12_GH0.tar.gz) = 2986578	3	SIZE (AravisProject-aravis-0.8.20_GH0.tar.gz) = 950371




--- Makefile.am.orig	2018-05-03 12:25:25 UTC
+++ Makefile.am
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc --enable-gst-plugin --enable-gst-0.10-plugin --enable-viewer --enable-cpp-test --enable-appstream-util
 
-SUBDIRS = src man
+SUBDIRS = man
 
 if ARAVIS_BUILD_VIEWER
 SUBDIRS += viewer
@@ -20,16 +20,9 @@ if ARAVIS_BUILD_GST_0_10_PLUGIN
 SUBDIRS += gst-0.10
 endif
 
-SUBDIRS += tests po docs
 
-aravisdocdir = ${docdir}/aravis-@ARAVIS_API_VERSION@
-aravisdoc_DATA = 	\
-	README.md	\
-	COPYING		\
-	ChangeLog 	\
-	AUTHORS		\
-	NEWS
 
+
 EXTRA_DIST += m4/introspection.m4 README.md
 
 # Copy all the spec files. Of cource, only one is actually used.
@@ -40,11 +33,5 @@ dist-hook:
 		fi \
 	done
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = aravis-@ARAVIS_API_VERSION@.pc
 
-CLEANFILES = $(pkgconfig_DATA)
-
-%-@ARAVIS_API_VERSION@.pc: %.pc
-	cp $< $@
 




bin/arv-viewer-0.8
share/applications/arv-viewer-0.8.desktop
share/icons/hicolor/128x128/apps/aravis-0.8.png
share/icons/hicolor/22x22/apps/aravis-0.8.png
share/icons/hicolor/256x256/apps/aravis-0.8.png
share/icons/hicolor/32x32/apps/aravis-0.8.png
share/icons/hicolor/48x48/apps/aravis-0.8.png
share/locale/bs/LC_MESSAGES/aravis-0.8.mo
share/locale/ca/LC_MESSAGES/aravis-0.8.mo
share/locale/cs/LC_MESSAGES/aravis-0.8.mo
share/locale/da/LC_MESSAGES/aravis-0.8.mo
share/locale/de/LC_MESSAGES/aravis-0.8.mo
share/locale/el/LC_MESSAGES/aravis-0.8.mo
share/locale/es/LC_MESSAGES/aravis-0.8.mo
share/locale/eu/LC_MESSAGES/aravis-0.8.mo
share/locale/fi/LC_MESSAGES/aravis-0.8.mo
share/locale/fr/LC_MESSAGES/aravis-0.8.mo
share/locale/hu/LC_MESSAGES/aravis-0.8.mo
share/locale/id/LC_MESSAGES/aravis-0.8.mo
share/locale/lv/LC_MESSAGES/aravis-0.8.mo
share/locale/oc/LC_MESSAGES/aravis-0.8.mo
share/locale/pl/LC_MESSAGES/aravis-0.8.mo
share/locale/pt/LC_MESSAGES/aravis-0.8.mo
share/locale/pt_BR/LC_MESSAGES/aravis-0.8.mo
share/locale/ru/LC_MESSAGES/aravis-0.8.mo
share/locale/sl/LC_MESSAGES/aravis-0.8.mo
share/locale/sr/LC_MESSAGES/aravis-0.8.mo
share/locale/sr@latin/LC_MESSAGES/aravis-0.8.mo
share/locale/sv/LC_MESSAGES/aravis-0.8.mo
share/locale/tr/LC_MESSAGES/aravis-0.8.mo
share/locale/zh_CN/LC_MESSAGES/aravis-0.8.mo
share/metainfo/arv-viewer-0.8.appdata.xml

Return to bug 261103

Lines 1-8 Link Here

(-)b/devel/libaravis/Makefile (-16 / +16 lines)
1	# Created by: Rozhuk Ivan	1	# Created by: Rozhuk Ivan
2		2
3	PORTNAME= libaravis	3	PORTNAME= libaravis
4	DISTVERSIONPREFIX= ARAVIS_	4	DISTVERSION= 0.8.20
5	DISTVERSION= 0_5_12
6	CATEGORIES= devel	5	CATEGORIES= devel
7		6
8	MAINTAINER= rozhuk.im@gmail.com	7	MAINTAINER= rozhuk.im@gmail.com
Lines 11-49 COMMENT= Camera control and image acquisition library Link Here
11	LICENSE= LGPL21+	10	LICENSE= LGPL21+
12	LICENSE_FILE= ${WRKSRC}/COPYING	11	LICENSE_FILE= ${WRKSRC}/COPYING
13		12
14	BUILD_DEPENDS= g-ir-compiler:devel/gobject-introspection
15
16	CONFLICTS_INSTALL= ${PORTNAME}*	13	CONFLICTS_INSTALL= ${PORTNAME}*
17		14
18	USES= autoreconf gmake gnome libtool pkgconfig	15	USES= gnome libtool meson pkgconfig
19	USE_GITHUB= yes	16	USE_GITHUB= yes
20	GH_ACCOUNT= AravisProject	17	GH_ACCOUNT= AravisProject
21	GH_PROJECT= aravis	18	GH_PROJECT= aravis
22	USE_GNOME= glib20 intltool libxml2	19	USE_GNOME= glib20 intltool libxml2
23	GNU_CONFIGURE= yes
24	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
25	INSTALL_TARGET= install-strip	21	INSTALL_TARGET= install-strip
		22	#CFLAGS+= -D__APPLE__ -D__MACH__
26		23
27	CONFIGURE_ARGS= --enable-packet-socket=no --enable-viewer=no \	24	MESON_ARGS= -Dpacket-socket=disabled -Dviewer=disabled \
28	--enable-gst-plugin=no --enable-gst-0.10-plugin=no \	25	-Dgst-plugin=disabled -Dtests=false
29	--enable-cpp-test=no --enable-zlib-pc=yes
30	MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig"
31		26
32	DOCSDIR= ${PREFIX}/share/doc/aravis/aravis-0.6	27	DOCSDIR= ${PREFIX}/share/gtk-doc/html/aravis-0.8
33		28
34	OPTIONS_DEFINE= DOCS NLS FAST_HEARTBEAT USB	29	OPTIONS_DEFINE= DOCS GIR NLS FAST_HEARTBEAT USB
35	OPTIONS_DEFAULT= USB	30	OPTIONS_DEFAULT= USB
36	OPTIONS_SUB= yes	31	OPTIONS_SUB= yes
37		32
		33	DOCS_MESON_ENABLED= documentation
		34	DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc
		35
		36	GIR_DESC= Build Gobject Introspection
		37	GIR_USE= GNOME=introspection:build
		38	GIR_MESON_ENABLED= introspection
		39
38	NLS_USES= gettext	40	NLS_USES= gettext
39		41
40	FAST_HEARTBEAT_DESC= build with extremely fast heartbeat	42	FAST_HEARTBEAT_DESC= build with extremely fast heartbeat
41	FAST_HEARTBEAT_CONFIGURE_ENABLE= fast-heartbeat	43	FAST_HEARTBEAT_MESON_TRUE= fast-heartbeat
42		44
43	USB_DESC= build with USB support	45	USB_DESC= build with USB support
44	USB_CONFIGURE_ENABLE= usb	46	USB_MESON_ENABLED= usb
45		47
46	pre-configure:
47	@${ECHO_CMD} "EXTRA_DIST =" >> ${WRKSRC}/gtk-doc.make
48		48
49	.include <bsd.port.mk>	49	.include <bsd.port.mk>

Removed Link Here

(-)a/devel/libaravis/files/patch-Makefile.am (-20 lines)
1	--- Makefile.am.orig 2018-01-29 16:03:28 UTC
2	+++ Makefile.am
3	@@ -6,7 +6,7 @@
4
5	DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc --enable-gst-plugin --enable-gst-0.10-plugin --enable-viewer --enable-cpp-test --enable-appstream-util
6
7	-SUBDIRS = src man
8	+SUBDIRS = src
9
10	if ARAVIS_BUILD_VIEWER
11	SUBDIRS += viewer
12	@@ -20,7 +20,7 @@ if ARAVIS_BUILD_GST_0_10_PLUGIN
13	SUBDIRS += gst-0.10
14	endif
15
16	-SUBDIRS += tests po docs
17	+SUBDIRS += po docs
18
19	aravisdocdir = ${docdir}/aravis-@ARAVIS_API_VERSION@
20	aravisdoc_DATA = \

Removed Link Here

(-)a/devel/libaravis/files/patch-src_arvgvdevice.c (-27 lines)
1	--- src/arvgvdevice.c.orig 2017-04-10 13:30:09 UTC
2	+++ src/arvgvdevice.c
3	@@ -20,6 +20,8 @@
4	* @short_description: GigEVision device
5	*/
6
7	+#include <sys/param.h>
8	+
9	#include <arvgvdeviceprivate.h>
10	#include <arvdeviceprivate.h>
11	#include <arvgc.h>
12	@@ -36,9 +38,14 @@
13	#include <arvenumtypes.h>
14	#include <string.h>
15	#include <stdlib.h>
16	-#ifndef __APPLE__
17	+#ifdef __linux__
18	#include <linux/ip.h>
19	#endif
20	+#ifdef BSD
21	+#include <netinet/in.h>
22	+#include <netinet/ip.h>
23	+#define iphdr ip
24	+#endif
25	#include <netinet/udp.h>
26
27	static GObjectClass *parent_class = NULL;

Added Link Here

(-)b/devel/libaravis/files/patch-src_arvnetwork.c (+24 lines)
1	--- src/arvnetwork.c 2021-12-16 12:21:48.000000000 +0300
2	+++ src/arvnetwork.c 2022-01-11 09:09:41.448763000 +0300
3	@@ -354,6 +354,10 @@
4	return NULL;
5
6	for (ifap_iter = ifap; ifap_iter != NULL; ifap_iter = ifap_iter->ifa_next) {
7	+#ifdef IFF_BROADCAST
8	+ if ((ifap_iter->ifa_flags & IFF_BROADCAST) == 0)
9	+ continue; /* Skip interfaces without broadcast. */
10	+#endif
11	if ((ifap_iter->ifa_flags & IFF_UP) != 0 &&
12	(ifap_iter->ifa_flags & IFF_POINTOPOINT) == 0 &&
13	(ifap_iter->ifa_addr != NULL) &&
14	@@ -367,6 +371,10 @@
15	a->netmask = arv_memdup (ifap_iter->ifa_netmask, sizeof(struct sockaddr));
16	#if defined(__APPLE__) && defined(__MACH__)
17	if (ifap_iter->ifa_broadaddr)
18	+ a->broadaddr = arv_memdup(ifap_iter->ifa_broadaddr, sizeof(struct sockaddr));
19	+#elif defined(BSD)
20	+ if (ifap_iter->ifa_broadaddr &&
21	+ ifap_iter->ifa_broadaddr->sa_len != 0)
22	a->broadaddr = arv_memdup(ifap_iter->ifa_broadaddr, sizeof(struct sockaddr));
23	#else
24	if (ifap_iter->ifa_ifu.ifu_broadaddr)

Added Link Here

(-)b/devel/libaravis/files/patch-src_arvnetworkprivate.h (+27 lines)
1	--- src/arvnetworkprivate.h 2021-12-16 12:21:48.000000000 +0300
2	+++ src/arvnetworkprivate.h 2022-01-11 09:06:56.451339000 +0300
3	@@ -24,6 +24,8 @@
4	#ifndef ARV_NETWORK_PRIVATE_H
5	#define ARV_NETWORK_PRIVATE_H
6
7	+#include <sys/param.h>
8	+
9	#include <arvapi.h>
10
11	#include <gio/gnetworking.h>
12	@@ -38,8 +40,14 @@
13	#include <netinet/in.h>
14	#endif
15
16	-#if !defined(__APPLE__) && !defined(G_OS_WIN32)
17	+#ifdef __linux__
18	#include <linux/ip.h>
19	+#endif
20	+
21	+#ifdef BSD
22	+#include <netinet/in.h>
23	+#include <netinet/ip.h>
24	+#define iphdr ip
25	#endif
26
27	#ifndef G_OS_WIN32

Lines 1-24 Link Here

(-)b/devel/libaravis/files/patch-src_arvrealtime.c (-14 / +10 lines)
1	--- src/arvrealtime.c.orig 2017-04-10 13:30:09 UTC	1	--- src/arvrealtime.c 2021-12-16 12:21:48.000000000 +0300
2	+++ src/arvrealtime.c	2	+++ src/arvrealtime.c 2022-01-11 09:15:09.398438000 +0300
3	@@ -27,6 +27,8 @@	3	@@ -27,6 +27,8 @@
4		4
5	***/	5	*/
6		6
7	+#include <sys/param.h>	7	+#include <sys/param.h>
8	+	8	+
9	#include <arvrealtimeprivate.h>	9	#include <arvrealtimeprivate.h>
10	#include <arvdebug.h>	10	#include <arvdebugprivate.h>
11	#include <memory.h>	11	#include <memory.h>
12	@@ -219,7 +221,12 @@ arv_rtkit_make_high_priority (GDBusConne	12	@@ -40,7 +42,7 @@
		13	#include <sys/types.h>
13	#endif	14	#endif
14		15
15	static pid_t _gettid(void) {	16	-#if !defined(__APPLE__) && !defined(G_OS_WIN32)
16	+#ifdef __linux__	17	+#if !defined(__APPLE__) && !defined(G_OS_WIN32) && !defined(BSD)
17	return (pid_t) syscall(SYS_gettid);
18	+#endif
19	+#ifdef BSD
20	+ return (pid_t) pthread_self();
21	+#endif
22	}
23		18
24	/**	19	#define RTKIT_SERVICE_NAME "org.freedesktop.RealtimeKit1"
		20	#define RTKIT_OBJECT_PATH "/org/freedesktop/RealtimeKit1"

Lines 1-110 Link Here

(-)b/devel/libaravis/pkg-plist (-110 / +196 lines)
1	bin/arv-fake-gv-camera-0.6	1	bin/arv-camera-test-0.8
2	bin/arv-test-0.6	2	bin/arv-fake-gv-camera-0.8
3	bin/arv-tool-0.6	3	bin/arv-test-0.8
4	include/aravis-0.6/arv.h	4	bin/arv-tool-0.8
5	include/aravis-0.6/arvbuffer.h	5	include/aravis-0.8/arv.h
6	include/aravis-0.6/arvcamera.h	6	include/aravis-0.8/arvapi.h
7	include/aravis-0.6/arvchunkparser.h	7	include/aravis-0.8/arvbuffer.h
8	include/aravis-0.6/arvdebug.h	8	include/aravis-0.8/arvcamera.h
9	include/aravis-0.6/arvdevice.h	9	include/aravis-0.8/arvchunkparser.h
10	include/aravis-0.6/arvdomcharacterdata.h	10	include/aravis-0.8/arvdebug.h
11	include/aravis-0.6/arvdomdocument.h	11	include/aravis-0.8/arvdevice.h
12	include/aravis-0.6/arvdomdocumentfragment.h	12	include/aravis-0.8/arvdomcharacterdata.h
13	include/aravis-0.6/arvdomelement.h	13	include/aravis-0.8/arvdomdocument.h
14	include/aravis-0.6/arvdomimplementation.h	14	include/aravis-0.8/arvdomdocumentfragment.h
15	include/aravis-0.6/arvdomnamednodemap.h	15	include/aravis-0.8/arvdomelement.h
16	include/aravis-0.6/arvdomnode.h	16	include/aravis-0.8/arvdomimplementation.h
17	include/aravis-0.6/arvdomnodelist.h	17	include/aravis-0.8/arvdomnamednodemap.h
18	include/aravis-0.6/arvdomparser.h	18	include/aravis-0.8/arvdomnode.h
19	include/aravis-0.6/arvdomtext.h	19	include/aravis-0.8/arvdomnodechildlist.h
20	include/aravis-0.6/arvenums.h	20	include/aravis-0.8/arvdomnodelist.h
21	include/aravis-0.6/arvenumtypes.h	21	include/aravis-0.8/arvdomparser.h
22	include/aravis-0.6/arvevaluator.h	22	include/aravis-0.8/arvdomtext.h
23	include/aravis-0.6/arvfakecamera.h	23	include/aravis-0.8/arvenums.h
24	include/aravis-0.6/arvfakedevice.h	24	include/aravis-0.8/arvevaluator.h
25	include/aravis-0.6/arvfakeinterface.h	25	include/aravis-0.8/arvfakecamera.h
26	include/aravis-0.6/arvfakestream.h	26	include/aravis-0.8/arvfakedevice.h
27	include/aravis-0.6/arvfeatures.h	27	include/aravis-0.8/arvfakeinterface.h
28	include/aravis-0.6/arvgc.h	28	include/aravis-0.8/arvfakestream.h
29	include/aravis-0.6/arvgcboolean.h	29	include/aravis-0.8/arvfeatures.h
30	include/aravis-0.6/arvgccategory.h	30	include/aravis-0.8/arvgc.h
31	include/aravis-0.6/arvgccommand.h	31	include/aravis-0.8/arvgcboolean.h
32	include/aravis-0.6/arvgcconverter.h	32	include/aravis-0.8/arvgccategory.h
33	include/aravis-0.6/arvgcenumentry.h	33	include/aravis-0.8/arvgccommand.h
34	include/aravis-0.6/arvgcenumeration.h	34	include/aravis-0.8/arvgcconverter.h
35	include/aravis-0.6/arvgcfeaturenode.h	35	include/aravis-0.8/arvgcconverternode.h
36	include/aravis-0.6/arvgcfloat.h	36	include/aravis-0.8/arvgcenumentry.h
37	include/aravis-0.6/arvgcfloatnode.h	37	include/aravis-0.8/arvgcenumeration.h
38	include/aravis-0.6/arvgcgroupnode.h	38	include/aravis-0.8/arvgcenums.h
39	include/aravis-0.6/arvgcindexnode.h	39	include/aravis-0.8/arvgcfeaturenode.h
40	include/aravis-0.6/arvgcinteger.h	40	include/aravis-0.8/arvgcfloat.h
41	include/aravis-0.6/arvgcintegernode.h	41	include/aravis-0.8/arvgcfloatnode.h
42	include/aravis-0.6/arvgcinvalidatornode.h	42	include/aravis-0.8/arvgcfloatregnode.h
43	include/aravis-0.6/arvgcnode.h	43	include/aravis-0.8/arvgcgroupnode.h
44	include/aravis-0.6/arvgcport.h	44	include/aravis-0.8/arvgcindexnode.h
45	include/aravis-0.6/arvgcpropertynode.h	45	include/aravis-0.8/arvgcintconverternode.h
46	include/aravis-0.6/arvgcregister.h	46	include/aravis-0.8/arvgcinteger.h
47	include/aravis-0.6/arvgcregisterdescriptionnode.h	47	include/aravis-0.8/arvgcintegernode.h
48	include/aravis-0.6/arvgcregisternode.h	48	include/aravis-0.8/arvgcintregnode.h
49	include/aravis-0.6/arvgcstring.h	49	include/aravis-0.8/arvgcintswissknifenode.h
50	include/aravis-0.6/arvgcstructentrynode.h	50	include/aravis-0.8/arvgcinvalidatornode.h
51	include/aravis-0.6/arvgcswissknife.h	51	include/aravis-0.8/arvgcmaskedintregnode.h
52	include/aravis-0.6/arvgcvalueindexednode.h	52	include/aravis-0.8/arvgcnode.h
53	include/aravis-0.6/arvgvcp.h	53	include/aravis-0.8/arvgcport.h
54	include/aravis-0.6/arvgvdevice.h	54	include/aravis-0.8/arvgcpropertynode.h
55	include/aravis-0.6/arvgvfakecamera.h	55	include/aravis-0.8/arvgcregister.h
56	include/aravis-0.6/arvgvinterface.h	56	include/aravis-0.8/arvgcregisterdescriptionnode.h
57	include/aravis-0.6/arvgvsp.h	57	include/aravis-0.8/arvgcregisternode.h
58	include/aravis-0.6/arvgvstream.h	58	include/aravis-0.8/arvgcselector.h
59	include/aravis-0.6/arvinterface.h	59	include/aravis-0.8/arvgcstring.h
60	include/aravis-0.6/arvmisc.h	60	include/aravis-0.8/arvgcstringnode.h
61	include/aravis-0.6/arvrealtime.h	61	include/aravis-0.8/arvgcstringregnode.h
62	include/aravis-0.6/arvstr.h	62	include/aravis-0.8/arvgcstructentrynode.h
63	include/aravis-0.6/arvstream.h	63	include/aravis-0.8/arvgcstructregnode.h
64	include/aravis-0.6/arvsystem.h	64	include/aravis-0.8/arvgcswissknife.h
65	include/aravis-0.6/arvtypes.h	65	include/aravis-0.8/arvgcswissknifenode.h
66	include/aravis-0.6/arvuvcp.h	66	include/aravis-0.8/arvgcvalueindexednode.h
67	include/aravis-0.6/arvuvdevice.h	67	include/aravis-0.8/arvgvdevice.h
68	include/aravis-0.6/arvuvinterface.h	68	include/aravis-0.8/arvgvfakecamera.h
69	include/aravis-0.6/arvuvsp.h	69	include/aravis-0.8/arvgvinterface.h
70	include/aravis-0.6/arvuvstream.h	70	include/aravis-0.8/arvgvstream.h
71	include/aravis-0.6/arvversion.h	71	include/aravis-0.8/arvinterface.h
72	include/aravis-0.6/arvxmlschema.h	72	include/aravis-0.8/arvmisc.h
73	include/aravis-0.6/arvzip.h	73	include/aravis-0.8/arvrealtime.h
74	lib/girepository-1.0/Aravis-0.6.typelib	74	include/aravis-0.8/arvstr.h
75	lib/libaravis-0.6.a	75	include/aravis-0.8/arvstream.h
76	lib/libaravis-0.6.so	76	include/aravis-0.8/arvsystem.h
77	lib/libaravis-0.6.so.0	77	include/aravis-0.8/arvtypes.h
78	lib/libaravis-0.6.so.0.0.0	78	include/aravis-0.8/arvuvdevice.h
79	libdata/pkgconfig/aravis-0.6.pc	79	include/aravis-0.8/arvuvinterface.h
80	share/aravis-0.6/arv-fake-camera.xml	80	include/aravis-0.8/arvuvstream.h
81	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS	81	include/aravis-0.8/arvversion.h
82	%%PORTDOCS%%%%DOCSDIR%%/COPYING	82	include/aravis-0.8/arvxmlschema.h
83	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	83	include/aravis-0.8/arvzip.h
84	%%PORTDOCS%%%%DOCSDIR%%/NEWS	84	%%GIR%%lib/girepository-1.0/Aravis-0.8.typelib
85	%%PORTDOCS%%%%DOCSDIR%%/README.md	85	lib/libaravis-0.8.so
86	share/gir-1.0/Aravis-0.6.gir	86	lib/libaravis-0.8.so.0
87	%%NLS%%share/locale/bs/LC_MESSAGES/aravis-0.6.mo	87	lib/libaravis-0.8.so.0.8.20
88	%%NLS%%share/locale/ca/LC_MESSAGES/aravis-0.6.mo	88	libdata/pkgconfig/aravis-0.8.pc
89	%%NLS%%share/locale/cs/LC_MESSAGES/aravis-0.6.mo	89	%%PORTDOCS%%man/man1/arv-tool-0.8.1.gz
90	%%NLS%%share/locale/da/LC_MESSAGES/aravis-0.6.mo	90	%%GIR%%share/gir-1.0/Aravis-0.8.gir
91	%%NLS%%share/locale/de/LC_MESSAGES/aravis-0.6.mo	91	%%PORTDOCS%%%%DOCSDIR%%/ArvBuffer.html
92	%%NLS%%share/locale/el/LC_MESSAGES/aravis-0.6.mo	92	%%PORTDOCS%%%%DOCSDIR%%/ArvCamera.html
93	%%NLS%%share/locale/es/LC_MESSAGES/aravis-0.6.mo	93	%%PORTDOCS%%%%DOCSDIR%%/ArvChunkParser.html
94	%%NLS%%share/locale/eu/LC_MESSAGES/aravis-0.6.mo	94	%%PORTDOCS%%%%DOCSDIR%%/ArvDevice.html
95	%%NLS%%share/locale/fi/LC_MESSAGES/aravis-0.6.mo	95	%%PORTDOCS%%%%DOCSDIR%%/ArvDomCharacterData.html
96	%%NLS%%share/locale/fr/LC_MESSAGES/aravis-0.6.mo	96	%%PORTDOCS%%%%DOCSDIR%%/ArvDomDocument.html
97	%%NLS%%share/locale/hu/LC_MESSAGES/aravis-0.6.mo	97	%%PORTDOCS%%%%DOCSDIR%%/ArvDomDocumentFragment.html
98	%%NLS%%share/locale/id/LC_MESSAGES/aravis-0.6.mo	98	%%PORTDOCS%%%%DOCSDIR%%/ArvDomElement.html
99	%%NLS%%share/locale/lv/LC_MESSAGES/aravis-0.6.mo	99	%%PORTDOCS%%%%DOCSDIR%%/ArvDomNamedNodeMap.html
100	%%NLS%%share/locale/oc/LC_MESSAGES/aravis-0.6.mo	100	%%PORTDOCS%%%%DOCSDIR%%/ArvDomNode.html
101	%%NLS%%share/locale/pl/LC_MESSAGES/aravis-0.6.mo	101	%%PORTDOCS%%%%DOCSDIR%%/ArvDomNodeChildList.html
102	%%NLS%%share/locale/pt/LC_MESSAGES/aravis-0.6.mo	102	%%PORTDOCS%%%%DOCSDIR%%/ArvDomNodeList.html
103	%%NLS%%share/locale/pt_BR/LC_MESSAGES/aravis-0.6.mo	103	%%PORTDOCS%%%%DOCSDIR%%/ArvDomText.html
104	%%NLS%%share/locale/ru/LC_MESSAGES/aravis-0.6.mo	104	%%PORTDOCS%%%%DOCSDIR%%/ArvEvaluator.html
105	%%NLS%%share/locale/sl/LC_MESSAGES/aravis-0.6.mo	105	%%PORTDOCS%%%%DOCSDIR%%/ArvFakeCamera.html
106	%%NLS%%share/locale/sr/LC_MESSAGES/aravis-0.6.mo	106	%%PORTDOCS%%%%DOCSDIR%%/ArvFakeDevice.html
107	%%NLS%%share/locale/sr@latin/LC_MESSAGES/aravis-0.6.mo	107	%%PORTDOCS%%%%DOCSDIR%%/ArvFakeInterface.html
108	%%NLS%%share/locale/sv/LC_MESSAGES/aravis-0.6.mo	108	%%PORTDOCS%%%%DOCSDIR%%/ArvFakeStream.html
109	%%NLS%%share/locale/tr/LC_MESSAGES/aravis-0.6.mo	109	%%PORTDOCS%%%%DOCSDIR%%/ArvGc.html
110	%%NLS%%share/locale/zh_CN/LC_MESSAGES/aravis-0.6.mo	110	%%PORTDOCS%%%%DOCSDIR%%/ArvGcBoolean.html
		111	%%PORTDOCS%%%%DOCSDIR%%/ArvGcCategory.html
		112	%%PORTDOCS%%%%DOCSDIR%%/ArvGcCommand.html
		113	%%PORTDOCS%%%%DOCSDIR%%/ArvGcConverter.html
		114	%%PORTDOCS%%%%DOCSDIR%%/ArvGcConverterNode.html
		115	%%PORTDOCS%%%%DOCSDIR%%/ArvGcEnumEntry.html
		116	%%PORTDOCS%%%%DOCSDIR%%/ArvGcEnumeration.html
		117	%%PORTDOCS%%%%DOCSDIR%%/ArvGcFeatureNode.html
		118	%%PORTDOCS%%%%DOCSDIR%%/ArvGcFloat.html
		119	%%PORTDOCS%%%%DOCSDIR%%/ArvGcFloatNode.html
		120	%%PORTDOCS%%%%DOCSDIR%%/ArvGcGroupNode.html
		121	%%PORTDOCS%%%%DOCSDIR%%/ArvGcIndexNode.html
		122	%%PORTDOCS%%%%DOCSDIR%%/ArvGcIntConverterNode.html
		123	%%PORTDOCS%%%%DOCSDIR%%/ArvGcInteger.html
		124	%%PORTDOCS%%%%DOCSDIR%%/ArvGcIntegerNode.html
		125	%%PORTDOCS%%%%DOCSDIR%%/ArvGcInvalidatorNode.html
		126	%%PORTDOCS%%%%DOCSDIR%%/ArvGcNode.html
		127	%%PORTDOCS%%%%DOCSDIR%%/ArvGcPort.html
		128	%%PORTDOCS%%%%DOCSDIR%%/ArvGcPropertyNode.html
		129	%%PORTDOCS%%%%DOCSDIR%%/ArvGcRegister.html
		130	%%PORTDOCS%%%%DOCSDIR%%/ArvGcRegisterDescriptionNode.html
		131	%%PORTDOCS%%%%DOCSDIR%%/ArvGcRegisterNode.html
		132	%%PORTDOCS%%%%DOCSDIR%%/ArvGcSelector.html
		133	%%PORTDOCS%%%%DOCSDIR%%/ArvGcString.html
		134	%%PORTDOCS%%%%DOCSDIR%%/ArvGcStringNode.html
		135	%%PORTDOCS%%%%DOCSDIR%%/ArvGcStructEntryNode.html
		136	%%PORTDOCS%%%%DOCSDIR%%/ArvGcSwissKnife.html
		137	%%PORTDOCS%%%%DOCSDIR%%/ArvGcValueIndexedNode.html
		138	%%PORTDOCS%%%%DOCSDIR%%/ArvGvDevice.html
		139	%%PORTDOCS%%%%DOCSDIR%%/ArvGvFakeCamera.html
		140	%%PORTDOCS%%%%DOCSDIR%%/ArvGvInterface.html
		141	%%PORTDOCS%%%%DOCSDIR%%/ArvGvStream.html
		142	%%PORTDOCS%%%%DOCSDIR%%/ArvInterface.html
		143	%%PORTDOCS%%%%DOCSDIR%%/ArvStream.html
		144	%%PORTDOCS%%%%DOCSDIR%%/ArvUvDevice.html
		145	%%PORTDOCS%%%%DOCSDIR%%/ArvUvInterface.html
		146	%%PORTDOCS%%%%DOCSDIR%%/ArvUvStream.html
		147	%%PORTDOCS%%%%DOCSDIR%%/ArvXmlSchema.html
		148	%%PORTDOCS%%%%DOCSDIR%%/annotation-glossary.html
		149	%%PORTDOCS%%%%DOCSDIR%%/aravis-Arv.html
		150	%%PORTDOCS%%%%DOCSDIR%%/aravis-ArvDebug.html
		151	%%PORTDOCS%%%%DOCSDIR%%/aravis-ArvGst.html
		152	%%PORTDOCS%%%%DOCSDIR%%/aravis-ArvStr.html
		153	%%PORTDOCS%%%%DOCSDIR%%/aravis-ArvZip.html
		154	%%PORTDOCS%%%%DOCSDIR%%/aravis-building.html
		155	%%PORTDOCS%%%%DOCSDIR%%/aravis-gv-introduction.html
		156	%%PORTDOCS%%%%DOCSDIR%%/aravis-gv.html
		157	%%PORTDOCS%%%%DOCSDIR%%/aravis-gvcp.html
		158	%%PORTDOCS%%%%DOCSDIR%%/aravis-gvsp.html
		159	%%PORTDOCS%%%%DOCSDIR%%/aravis-introduction.html
		160	%%PORTDOCS%%%%DOCSDIR%%/aravis-overview.html
		161	%%PORTDOCS%%%%DOCSDIR%%/aravis-reference.html
		162	%%PORTDOCS%%%%DOCSDIR%%/aravis.devhelp2
		163	%%PORTDOCS%%%%DOCSDIR%%/ch04.html
		164	%%PORTDOCS%%%%DOCSDIR%%/ch05.html
		165	%%PORTDOCS%%%%DOCSDIR%%/ch06.html
		166	%%PORTDOCS%%%%DOCSDIR%%/ch07.html
		167	%%PORTDOCS%%%%DOCSDIR%%/ch08.html
		168	%%PORTDOCS%%%%DOCSDIR%%/ch09.html
		169	%%PORTDOCS%%%%DOCSDIR%%/ch10.html
		170	%%PORTDOCS%%%%DOCSDIR%%/ch11.html
		171	%%PORTDOCS%%%%DOCSDIR%%/home.png
		172	%%PORTDOCS%%%%DOCSDIR%%/index.html
		173	%%PORTDOCS%%%%DOCSDIR%%/ix01.html
		174	%%PORTDOCS%%%%DOCSDIR%%/ix02.html
175	%%PORTDOCS%%%%DOCSDIR%%/ix03.html
176	%%PORTDOCS%%%%DOCSDIR%%/ix04.html
177	%%PORTDOCS%%%%DOCSDIR%%/ix05.html
178	%%PORTDOCS%%%%DOCSDIR%%/ix06.html
179	%%PORTDOCS%%%%DOCSDIR%%/ix07.html
180	%%PORTDOCS%%%%DOCSDIR%%/ix08.html
181	%%PORTDOCS%%%%DOCSDIR%%/ix09.html
182	%%PORTDOCS%%%%DOCSDIR%%/ix10.html
183	%%PORTDOCS%%%%DOCSDIR%%/ix11.html
184	%%PORTDOCS%%%%DOCSDIR%%/ix12.html
185	%%PORTDOCS%%%%DOCSDIR%%/ix13.html
186	%%PORTDOCS%%%%DOCSDIR%%/ix14.html
187	%%PORTDOCS%%%%DOCSDIR%%/ix15.html
188	%%PORTDOCS%%%%DOCSDIR%%/ix16.html
189	%%PORTDOCS%%%%DOCSDIR%%/left-insensitive.png
190	%%PORTDOCS%%%%DOCSDIR%%/left.png
191	%%PORTDOCS%%%%DOCSDIR%%/right-insensitive.png
192	%%PORTDOCS%%%%DOCSDIR%%/right.png
193	%%PORTDOCS%%%%DOCSDIR%%/style.css
194	%%PORTDOCS%%%%DOCSDIR%%/thread-safety.html
195	%%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png
196	%%PORTDOCS%%%%DOCSDIR%%/up.png

Lines 1-8 Link Here

(-)b/multimedia/aravis/Makefile (-18 / +14 lines)
1	# Created by: Rozhuk Ivan rozhuk.im@gmail.com	1	# Created by: Rozhuk Ivan rozhuk.im@gmail.com
2		2
3	PORTNAME= aravis	3	PORTNAME= aravis
4	DISTVERSIONPREFIX= ARAVIS_	4	DISTVERSION= 0.8.20
5	DISTVERSION= 0_5_12
6	CATEGORIES= multimedia	5	CATEGORIES= multimedia
7		6
8	MAINTAINER= rozhuk.im@gmail.com	7	MAINTAINER= rozhuk.im@gmail.com
Lines 13-41 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
13		12
14	CONFLICTS_INSTALL= ${PORTNAME}*	13	CONFLICTS_INSTALL= ${PORTNAME}*
15		14
16	LIB_DEPENDS+= libaravis-0.6.so:devel/libaravis \	15	LIB_DEPENDS+= libaravis-0.8.so:devel/libaravis \
17	libnotify.so:devel/libnotify	16	libnotify.so:devel/libnotify
18		17
19	USES= autoreconf gettext gmake gnome libtool pkgconfig	18	USES= gnome libtool meson pkgconfig
20	USE_GNOME= cairo glib20 intltool gtk30	19	USE_GNOME= cairo glib20 intltool gtk30
21	USE_GSTREAMER1= yes	20	USE_GSTREAMER1= yes
22	GNU_CONFIGURE= yes
23	# USE_LDCONFIG= yes
24		21
25	USE_GITHUB= yes	22	USE_GITHUB= yes
26	GH_ACCOUNT= AravisProject	23	GH_ACCOUNT= AravisProject
27		24
28	CONFIGURE_ARGS= --enable-packet-socket=no --enable-viewer=yes \	25	MESON_ARGS= -Dpacket-socket=disabled -Dviewer=enabled \
29	--enable-gst-plugin=no --enable-gst-0.10-plugin=no \	26	-Ddocumentation=disabled -Dintrospection=disabled \
30	--enable-gtk-doc=no --enable-cpp-test=no \	27	-Dgst-plugin=disabled -Dtests=false -Dusb=disabled
31	--enable-usb=no --enable-zlib-pc=yes	28
32	MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig"	29	post-patch:
33		30	@${REINPLACE_CMD} -e "s\|subdir ('src')\|aravis_dependencies += dependency ('aravis-0.8', version: '>=0.8', required: true)\|g" \
34	pre-configure:	31	-e 's\|meson.override_dependency.*\|\|g' \
35	${ECHO_CMD} "EXTRA_DIST =" >> ${WRKSRC}/gtk-doc.make	32	${WRKSRC}/meson.build
36	@${REINPLACE_CMD} -e 's\|GTK_DOC_CHECK(\[1.14\],\[--flavour no-tmpl\])\|\|' \	33	@${REINPLACE_CMD} -e "s\|.aravis_library.\|\|g" \
37	${WRKSRC}/configure.ac	34	-e "s\|library_inc\|include_directories('../src')\|g" \
38	@${REINPLACE_CMD} -e 's\|^arv_viewer_LDADD.=.\|arv_viewer_LDADD = $${ARAVIS_VIEWER_LIBS} -laravis-0.6\|' \	35	${WRKSRC}/viewer/meson.build
39	${WRKSRC}/viewer/Makefile.am
40		36
41	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Removed Link Here

(-)a/multimedia/aravis/files/patch-Makefile.am (-41 lines)
1	--- Makefile.am.orig 2018-05-03 12:25:25 UTC
2	+++ Makefile.am
3	@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I m4
4
5	DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc --enable-gst-plugin --enable-gst-0.10-plugin --enable-viewer --enable-cpp-test --enable-appstream-util
6
7	-SUBDIRS = src man
8	+SUBDIRS = man
9
10	if ARAVIS_BUILD_VIEWER
11	SUBDIRS += viewer
12	@@ -20,16 +20,9 @@ if ARAVIS_BUILD_GST_0_10_PLUGIN
13	SUBDIRS += gst-0.10
14	endif
15
16	-SUBDIRS += tests po docs
17
18	-aravisdocdir = ${docdir}/aravis-@ARAVIS_API_VERSION@
19	-aravisdoc_DATA = \
20	- README.md \
21	- COPYING \
22	- ChangeLog \
23	- AUTHORS \
24	- NEWS
25
26	+
27	EXTRA_DIST += m4/introspection.m4 README.md
28
29	# Copy all the spec files. Of cource, only one is actually used.
30	@@ -40,11 +33,5 @@ dist-hook:
31	fi \
32	done
33
34	-pkgconfigdir = $(libdir)/pkgconfig
35	-pkgconfig_DATA = aravis-@ARAVIS_API_VERSION@.pc
36
37	-CLEANFILES = $(pkgconfig_DATA)
38	-
39	-%-@ARAVIS_API_VERSION@.pc: %.pc
40	- cp $< $@
41

Lines 1-13 Link Here

(-)b/multimedia/aravis/pkg-plist (-13 / +32 lines)
1	bin/arv-viewer	1	bin/arv-viewer-0.8
2	man/man1/arv-tool-0.6.1.gz	2	share/applications/arv-viewer-0.8.desktop
3	man/man1/arv-viewer.1.gz	3	share/icons/hicolor/128x128/apps/aravis-0.8.png
4	share/appdata/arv-viewer.appdata.xml	4	share/icons/hicolor/22x22/apps/aravis-0.8.png
5	share/applications/arv-viewer.desktop	5	share/icons/hicolor/256x256/apps/aravis-0.8.png
6	%%DATADIR%%-0.6/arv-viewer.ui	6	share/icons/hicolor/32x32/apps/aravis-0.8.png
7	share/icons/hicolor/22x22/apps/aravis.png	7	share/icons/hicolor/48x48/apps/aravis-0.8.png
8	share/icons/hicolor/256x256/apps/aravis.png	8	share/locale/bs/LC_MESSAGES/aravis-0.8.mo
9	share/icons/hicolor/32x32/apps/aravis.png	9	share/locale/ca/LC_MESSAGES/aravis-0.8.mo
10	share/icons/hicolor/48x48/apps/aravis.png	10	share/locale/cs/LC_MESSAGES/aravis-0.8.mo
11	share/icons/hicolor/scalable/devices/aravis-fake-symbolic.svg	11	share/locale/da/LC_MESSAGES/aravis-0.8.mo
12	share/icons/hicolor/scalable/devices/aravis-gigevision-symbolic.svg	12	share/locale/de/LC_MESSAGES/aravis-0.8.mo
13	share/icons/hicolor/scalable/devices/aravis-usb3vision-symbolic.svg	13	share/locale/el/LC_MESSAGES/aravis-0.8.mo
		14	share/locale/es/LC_MESSAGES/aravis-0.8.mo
		15	share/locale/eu/LC_MESSAGES/aravis-0.8.mo
		16	share/locale/fi/LC_MESSAGES/aravis-0.8.mo
		17	share/locale/fr/LC_MESSAGES/aravis-0.8.mo
		18	share/locale/hu/LC_MESSAGES/aravis-0.8.mo
		19	share/locale/id/LC_MESSAGES/aravis-0.8.mo
		20	share/locale/lv/LC_MESSAGES/aravis-0.8.mo
		21	share/locale/oc/LC_MESSAGES/aravis-0.8.mo
		22	share/locale/pl/LC_MESSAGES/aravis-0.8.mo
		23	share/locale/pt/LC_MESSAGES/aravis-0.8.mo
		24	share/locale/pt_BR/LC_MESSAGES/aravis-0.8.mo
		25	share/locale/ru/LC_MESSAGES/aravis-0.8.mo
		26	share/locale/sl/LC_MESSAGES/aravis-0.8.mo
		27	share/locale/sr/LC_MESSAGES/aravis-0.8.mo
		28	share/locale/sr@latin/LC_MESSAGES/aravis-0.8.mo
		29	share/locale/sv/LC_MESSAGES/aravis-0.8.mo
		30	share/locale/tr/LC_MESSAGES/aravis-0.8.mo
		31	share/locale/zh_CN/LC_MESSAGES/aravis-0.8.mo
		32	share/metainfo/arv-viewer-0.8.appdata.xml