1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

graphics/entangle: the port had been updated to transient version (+)

- Belatedly update Entangle to version 1.0 (newer versions are available,
  but they cannot be easily ported without making changes to the code as
  they crash with segmentation fault unmodified)
- Now builds itself using Meson instead of GNU autotools and make, hence
  drop no longer relevant knobs from the Makefile
- Adjust dependencies: remove unused ones, limit the scope of `gettext'
  to NLS case only, drop version specification from `USES=python' which
  is not needed since r564032 and was probably not very accurate anyway
- Reclaim maintainership after previous maintainer had stepped down, and
  chase HTTP 302 redirection in the MASTER_SITES and WWW line while here

PR:	235780
This commit is contained in:
Alexey Dokuchaev 2021-07-29 02:37:42 +00:00
parent 12b88fd4f9
commit d066d350da
5 changed files with 92 additions and 83 deletions

View File

@ -1,54 +1,40 @@
# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
PORTNAME= entangle
PORTVERSION= 0.7.2
PORTREVISION= 5
PORTVERSION= 1.0
CATEGORIES= graphics
MASTER_SITES= http://entangle-photo.org/download/sources/
MASTER_SITES= https://www.entangle-photo.org/download/sources/
MAINTAINER= ports@FreeBSD.org
MAINTAINER= danfe@FreeBSD.org
COMMENT= Digital camera tethered control and capture program
LICENSE= GPLv3
BUILD_DEPENDS= ${LOCALBASE}/share/icons/mate/scalable/devices/camera-photo-symbolic.svg:x11-themes/mate-icon-theme \
itstool:textproc/itstool
BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc
LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 \
libdbus-glib-1.so:devel/dbus-glib \
liblcms2.so:graphics/lcms2 \
libgexiv2.so:graphics/gexiv2 \
libraw_r.so:graphics/libraw \
libpeas-1.0.so:devel/libpeas
RUN_DEPENDS:= ${BUILD_DEPENDS:Nitstool*} \
${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>0:devel/py-libpeas@${PY_FLAVOR}
USES= compiler:c++11-lang gettext-tools gmake gnome libtool \
pkgconfig python:3.4+ xorg
GNU_CONFIGURE= yes
USES= compiler:c++11-lang gnome meson pkgconfig python tar:xz xorg
USE_GNOME= cairo gtk30 intltool introspection
USE_GSTREAMER1= core
USE_XORG= xext
GLIB_SCHEMAS= org.entangle-photo.manager.gschema.xml
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
NLS_CONFIGURE_OFF= --disable-nls
NLS_USES= gettext-runtime
NLS_USES= gettext
post-patch:
@${REINPLACE_CMD} -e '/checking for GUDEV/,+93d ; \
s,gstreamer-plugins-base-1,gstreamer-base-1, ; \
s,gnome-icon-theme-symbolic,mate-icon-theme, ; \
s,/usr/share/icons/gnome,${LOCALBASE}/share/icons/mate,' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's,_udev,,' \
${WRKSRC}/src/backend/entangle-camera-list.c
@${REINPLACE_CMD} -e '/gudev_dep/d' \
${WRKSRC}/src/backend/meson.build
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1506163737
SHA256 (entangle-0.7.2.tar.gz) = 006de43738a77c3183b5c86c1fe97970443d13460680c6c380f81df806e12a68
SIZE (entangle-0.7.2.tar.gz) = 987791
TIMESTAMP = 1507670620
SHA256 (entangle-1.0.tar.xz) = 6937433ebb9ea91116ea71363fdfbb214ea52b7c168900d453c3156230027d36
SIZE (entangle-1.0.tar.xz) = 494440

View File

@ -0,0 +1,27 @@
--- meson.build.orig 2017-10-10 21:07:59 UTC
+++ meson.build
@@ -18,7 +18,6 @@ glib_min_version = '>= 2.36.0'
gdk_pixbuf_min_version = '>= 2.12.0'
gtk_min_version = '>= 3.12.0'
gphoto2_min_version = '>= 2.5.0'
-gudev_min_version = '>= 145'
gobject_introspection_min_version = '>= 0.9.3'
lcms2_min_version = '>= 2.0'
libpeas_min_version = '>= 1.2.0'
@@ -34,15 +33,13 @@ gmodule_dep = dependency('gmodule-2.0', version: glib_
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_min_version)
gtk_dep = dependency('gtk+-3.0', version: gtk_min_version)
gphoto2_dep = dependency('libgphoto2', version: gphoto2_min_version)
-gudev_dep = dependency('gudev-1.0', version: gudev_min_version)
gobject_introspection_dep = dependency('gobject-introspection-1.0', version: gobject_introspection_min_version)
lcms2_dep = dependency('lcms2', version: lcms2_min_version)
libpeas_dep = dependency('libpeas-1.0', version: libpeas_min_version)
libpeas_gtk_dep = dependency('libpeas-gtk-1.0', version: libpeas_min_version)
gexiv2_dep = dependency('gexiv2', version: gexiv2_min_version)
xext_dep = dependency('xext', version: xext_min_version)
-#libraw_dep = dependency('libraw_r', version: libraw_min_version)
-libraw_dep = cc.find_library('libraw_r')
+libraw_dep = dependency('libraw_r', version: libraw_min_version)
gst_dep = dependency('gstreamer-1.0', version: gst_min_version)
gst_video_dep = dependency('gstreamer-video-1.0', version: gst_min_version)

View File

@ -9,4 +9,4 @@ It includes control over camera shooting and configuration settings and
- Automatic download and display of photos as they are shot
- Control of all camera settings from computer
WWW: http://entangle-photo.org/
WWW: https://www.entangle-photo.org/

View File

@ -15,12 +15,6 @@ lib/libentangle_frontend.so.0.0.0
man/man1/entangle.1.gz
share/appdata/entangle.appdata.xml
share/applications/entangle.desktop
%%DATADIR%%/entangle-camera-manager.ui
%%DATADIR%%/entangle-camera-picker.ui
%%DATADIR%%/entangle-camera-support.ui
%%DATADIR%%/entangle-help-about.ui
%%DATADIR%%/entangle-media-popup.ui
%%DATADIR%%/entangle-preferences-display.ui
%%DATADIR%%/plugins/eclipse/schemas/gschemas.compiled
%%DATADIR%%/plugins/eclipse/schemas/org.entangle-photo.plugins.eclipse.gschema.xml
%%DATADIR%%/plugins/photobox/schemas/gschemas.compiled
@ -29,56 +23,6 @@ share/applications/entangle.desktop
%%DATADIR%%/plugins/shooter/schemas/org.entangle-photo.plugins.shooter.gschema.xml
%%DATADIR%%/sRGB.icc
share/gir-1.0/Entangle-0.1.gir
share/gtk-doc/html/Entangle/Entangle-entangle-debug.html
share/gtk-doc/html/Entangle/Entangle-entangle-dpms.html
share/gtk-doc/html/Entangle/Entangle-entangle-pixbuf.html
share/gtk-doc/html/Entangle/Entangle.devhelp2
share/gtk-doc/html/Entangle/EntangleApplication.html
share/gtk-doc/html/Entangle/EntangleCamera.html
share/gtk-doc/html/Entangle/EntangleCameraFile.html
share/gtk-doc/html/Entangle/EntangleCameraList.html
share/gtk-doc/html/Entangle/EntangleCameraManager.html
share/gtk-doc/html/Entangle/EntangleCameraPicker.html
share/gtk-doc/html/Entangle/EntangleCameraSupport.html
share/gtk-doc/html/Entangle/EntangleColourProfileTransform.html
share/gtk-doc/html/Entangle/EntangleControl.html
share/gtk-doc/html/Entangle/EntangleControlButton.html
share/gtk-doc/html/Entangle/EntangleControlChoice.html
share/gtk-doc/html/Entangle/EntangleControlDate.html
share/gtk-doc/html/Entangle/EntangleControlGroup.html
share/gtk-doc/html/Entangle/EntangleControlPanel.html
share/gtk-doc/html/Entangle/EntangleControlRange.html
share/gtk-doc/html/Entangle/EntangleControlText.html
share/gtk-doc/html/Entangle/EntangleControlToggle.html
share/gtk-doc/html/Entangle/EntangleDeviceManager.html
share/gtk-doc/html/Entangle/EntangleHelpAbout.html
share/gtk-doc/html/Entangle/EntangleImage.html
share/gtk-doc/html/Entangle/EntangleImageDisplay.html
share/gtk-doc/html/Entangle/EntangleImageHistogram.html
share/gtk-doc/html/Entangle/EntangleImageLoader.html
share/gtk-doc/html/Entangle/EntangleMediaPopup.html
share/gtk-doc/html/Entangle/EntangleMediaStatusbar.html
share/gtk-doc/html/Entangle/EntanglePixbufLoader.html
share/gtk-doc/html/Entangle/EntanglePreferences.html
share/gtk-doc/html/Entangle/EntanglePreferencesDisplay.html
share/gtk-doc/html/Entangle/EntangleProgress.html
share/gtk-doc/html/Entangle/EntangleSession.html
share/gtk-doc/html/Entangle/EntangleSessionBrowser.html
share/gtk-doc/html/Entangle/EntangleThumbnailLoader.html
share/gtk-doc/html/Entangle/annotation-glossary.html
share/gtk-doc/html/Entangle/api-index-full.html
share/gtk-doc/html/Entangle/ch01.html
share/gtk-doc/html/Entangle/ch02.html
share/gtk-doc/html/Entangle/home.png
share/gtk-doc/html/Entangle/index.html
share/gtk-doc/html/Entangle/left-insensitive.png
share/gtk-doc/html/Entangle/left.png
share/gtk-doc/html/Entangle/object-tree.html
share/gtk-doc/html/Entangle/right-insensitive.png
share/gtk-doc/html/Entangle/right.png
share/gtk-doc/html/Entangle/style.css
share/gtk-doc/html/Entangle/up-insensitive.png
share/gtk-doc/html/Entangle/up.png
share/help/C/entangle/camera-focusing.page
share/help/C/entangle/figures/entangle.png
share/help/C/entangle/image-capture.page
@ -203,3 +147,55 @@ share/icons/hicolor/scalable/apps/entangle.svg
%%NLS%%share/locale/zh_HK/LC_MESSAGES/entangle.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/entangle.mo
%%NLS%%share/locale/zu/LC_MESSAGES/entangle.mo
share/gtk-doc/html/entangle/EntangleApplication.html
share/gtk-doc/html/entangle/EntangleCamera.html
share/gtk-doc/html/entangle/EntangleCameraFile.html
share/gtk-doc/html/entangle/EntangleCameraList.html
share/gtk-doc/html/entangle/EntangleCameraManager.html
share/gtk-doc/html/entangle/EntangleCameraPicker.html
share/gtk-doc/html/entangle/EntangleCameraSupport.html
share/gtk-doc/html/entangle/EntangleColourProfileTransform.html
share/gtk-doc/html/entangle/EntangleControl.html
share/gtk-doc/html/entangle/EntangleControlButton.html
share/gtk-doc/html/entangle/EntangleControlChoice.html
share/gtk-doc/html/entangle/EntangleControlDate.html
share/gtk-doc/html/entangle/EntangleControlGroup.html
share/gtk-doc/html/entangle/EntangleControlPanel.html
share/gtk-doc/html/entangle/EntangleControlRange.html
share/gtk-doc/html/entangle/EntangleControlText.html
share/gtk-doc/html/entangle/EntangleControlToggle.html
share/gtk-doc/html/entangle/EntangleDeviceManager.html
share/gtk-doc/html/entangle/EntangleHelpAbout.html
share/gtk-doc/html/entangle/EntangleImage.html
share/gtk-doc/html/entangle/EntangleImageDisplay.html
share/gtk-doc/html/entangle/EntangleImageHistogram.html
share/gtk-doc/html/entangle/EntangleImageLoader.html
share/gtk-doc/html/entangle/EntangleMediaPopup.html
share/gtk-doc/html/entangle/EntangleMediaStatusbar.html
share/gtk-doc/html/entangle/EntanglePixbufLoader.html
share/gtk-doc/html/entangle/EntanglePreferences.html
share/gtk-doc/html/entangle/EntanglePreferencesDisplay.html
share/gtk-doc/html/entangle/EntangleProgress.html
share/gtk-doc/html/entangle/EntangleSession.html
share/gtk-doc/html/entangle/EntangleSessionBrowser.html
share/gtk-doc/html/entangle/EntangleThumbnailLoader.html
share/gtk-doc/html/entangle/annotation-glossary.html
share/gtk-doc/html/entangle/api-index-full.html
share/gtk-doc/html/entangle/ch01.html
share/gtk-doc/html/entangle/ch02.html
share/gtk-doc/html/entangle/entangle-entangle-debug.html
share/gtk-doc/html/entangle/entangle-entangle-dpms.html
share/gtk-doc/html/entangle/entangle-entangle-pixbuf.html
share/gtk-doc/html/entangle/entangle.devhelp2
share/gtk-doc/html/entangle/home.png
share/gtk-doc/html/entangle/index.html
share/gtk-doc/html/entangle/left-insensitive.png
share/gtk-doc/html/entangle/left.png
share/gtk-doc/html/entangle/right-insensitive.png
share/gtk-doc/html/entangle/right.png
share/gtk-doc/html/entangle/style.css
share/gtk-doc/html/entangle/up-insensitive.png
share/gtk-doc/html/entangle/up.png
share/help/C/entangle/camera-settings.page
share/help/C/entangle/multiple-cameras.page
share/help/C/entangle/plugin-shooter.page