update graphics/shotwell to 0.26.0
https://mail.gnome.org/archives/shotwell-list/2017-March/msg00017.html while here, regenerate patch and update my mail address Approved by: rene (mentor, implicit)
This commit is contained in:
parent
647ecd0c50
commit
6f71baf210
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=436988
6 changed files with 83 additions and 165 deletions
|
@ -2,11 +2,11 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= shotwell
|
||||
PORTVERSION= 0.24.5
|
||||
PORTVERSION= 0.26.0
|
||||
CATEGORIES= graphics gnome
|
||||
MASTER_SITES= GNOME/sources/shotwell/${PORTVERSION:R}
|
||||
|
||||
MAINTAINER= cmt@burggraben.net
|
||||
MAINTAINER= cmt@FreeBSD.org
|
||||
COMMENT= Open source photo manager for GNOME
|
||||
|
||||
LICENSE= LGPL21+
|
||||
|
@ -17,10 +17,13 @@ BUILD_DEPENDS= vala>=0.20.1:lang/vala \
|
|||
itstool:textproc/itstool
|
||||
LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
|
||||
libexiv2.so:graphics/exiv2 \
|
||||
libgcr-ui-3.so:security/gcr \
|
||||
libgdata.so:devel/libgdata \
|
||||
libgee-0.8.so:devel/libgee \
|
||||
libgstreamer-1.0.so:multimedia/gstreamer1 \
|
||||
liblcms2.so:graphics/lcms2 \
|
||||
libjson-glib-1.0.so:devel/json-glib \
|
||||
libp11-kit.so:security/p11-kit \
|
||||
libsoup-2.4.so:devel/libsoup \
|
||||
libgexiv2.so:graphics/gexiv2 \
|
||||
libexif.so:graphics/libexif \
|
||||
|
@ -30,7 +33,7 @@ LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
|
|||
libraw.so:graphics/libraw \
|
||||
librest-0.7.so:devel/librest
|
||||
|
||||
USES= gettext desktop-file-utils gmake libtool pkgconfig \
|
||||
USES= autoreconf gettext desktop-file-utils gmake libtool pkgconfig \
|
||||
sqlite tar:xz
|
||||
USE_GNOME= cairo dconf gtk30 gnomedocutils
|
||||
USE_GSTREAMER1= yes
|
||||
|
@ -38,16 +41,21 @@ USE_LDCONFIG= yes
|
|||
USE_XORG= x11
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ENV+= --define=NO_CAMERA
|
||||
CONFIGURE_ARGS+= --enable-publishers=all --enable-extra-plugins
|
||||
INSTALL_TARGET= install-strip
|
||||
INSTALLS_ICONS= yes
|
||||
PORTSCOUT= limitw:1,even
|
||||
MAKE_JOBS_UNSAFE= yes
|
||||
|
||||
OPTIONS_DEFINE= OPENMP
|
||||
OPTIONS_DEFAULT=
|
||||
OPENMP_DESC= libraw uses OpenMP (implies GCC 4.6+)
|
||||
OPTIONS_DEFINE= OPENMP NLS
|
||||
OPTIONS_DEFAULT= NLS
|
||||
OPENMP_DESC= libraw uses OpenMP (implies GCC 4.9+)
|
||||
|
||||
OPENMP_USES= compiler:gcc-c++11-lib
|
||||
NLS_CONFIGURE_ENABLE= nls
|
||||
NLS_USES= gettext
|
||||
NLS_LIBS= -L${LOCALBASE}/lib -lintl
|
||||
|
||||
OPENMP_USES= compiler:openmp
|
||||
OPENMP_USES_OFF= compiler:c++11-lib
|
||||
|
||||
GLIB_SCHEMAS= org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1485936802
|
||||
SHA256 (shotwell-0.24.5.tar.xz) = 4936c2c8c63b701ac0cf15b7bd6619ee3241a6d08b4187f2475348642ff9c1fd
|
||||
SIZE (shotwell-0.24.5.tar.xz) = 5374400
|
||||
TIMESTAMP = 1490472490
|
||||
SHA256 (shotwell-0.26.0.tar.xz) = 305df4d49971eb10f2a04b577ebbd9448202f13d51aa02608e433b8613df1024
|
||||
SIZE (shotwell-0.26.0.tar.xz) = 5583732
|
||||
|
|
|
@ -1,74 +0,0 @@
|
|||
--- configure.orig 2016-08-27 16:16:18.787328000 +0200
|
||||
+++ configure 2016-08-27 16:17:04.297291000 +0200
|
||||
@@ -8033,7 +8033,6 @@
|
||||
gstreamer-plugins-base-1.0 >= 1.0.0
|
||||
gstreamer-pbutils-1.0 >= 1.0.0
|
||||
gtk+-3.0 >= 3.12.2
|
||||
- gudev-1.0 >= 145
|
||||
libexif >= 0.6.16
|
||||
libgphoto2 >= 2.5.0
|
||||
libraw >= 0.13.2
|
||||
@@ -8053,7 +8052,6 @@
|
||||
gstreamer-plugins-base-1.0 >= 1.0.0
|
||||
gstreamer-pbutils-1.0 >= 1.0.0
|
||||
gtk+-3.0 >= 3.12.2
|
||||
- gudev-1.0 >= 145
|
||||
libexif >= 0.6.16
|
||||
libgphoto2 >= 2.5.0
|
||||
libraw >= 0.13.2
|
||||
@@ -8076,7 +8074,6 @@
|
||||
gstreamer-plugins-base-1.0 >= 1.0.0
|
||||
gstreamer-pbutils-1.0 >= 1.0.0
|
||||
gtk+-3.0 >= 3.12.2
|
||||
- gudev-1.0 >= 145
|
||||
libexif >= 0.6.16
|
||||
libgphoto2 >= 2.5.0
|
||||
libraw >= 0.13.2
|
||||
@@ -8107,7 +8104,6 @@
|
||||
gstreamer-plugins-base-1.0 >= 1.0.0
|
||||
gstreamer-pbutils-1.0 >= 1.0.0
|
||||
gtk+-3.0 >= 3.12.2
|
||||
- gudev-1.0 >= 145
|
||||
libexif >= 0.6.16
|
||||
libgphoto2 >= 2.5.0
|
||||
libraw >= 0.13.2
|
||||
@@ -8127,7 +8123,6 @@
|
||||
gstreamer-plugins-base-1.0 >= 1.0.0
|
||||
gstreamer-pbutils-1.0 >= 1.0.0
|
||||
gtk+-3.0 >= 3.12.2
|
||||
- gudev-1.0 >= 145
|
||||
libexif >= 0.6.16
|
||||
libgphoto2 >= 2.5.0
|
||||
libraw >= 0.13.2
|
||||
@@ -8150,7 +8145,6 @@
|
||||
gstreamer-plugins-base-1.0 >= 1.0.0
|
||||
gstreamer-pbutils-1.0 >= 1.0.0
|
||||
gtk+-3.0 >= 3.12.2
|
||||
- gudev-1.0 >= 145
|
||||
libexif >= 0.6.16
|
||||
libgphoto2 >= 2.5.0
|
||||
libraw >= 0.13.2
|
||||
@@ -8190,7 +8184,6 @@
|
||||
gstreamer-plugins-base-1.0 >= 1.0.0
|
||||
gstreamer-pbutils-1.0 >= 1.0.0
|
||||
gtk+-3.0 >= 3.12.2
|
||||
- gudev-1.0 >= 145
|
||||
libexif >= 0.6.16
|
||||
libgphoto2 >= 2.5.0
|
||||
libraw >= 0.13.2
|
||||
@@ -8211,7 +8204,6 @@
|
||||
gstreamer-plugins-base-1.0 >= 1.0.0
|
||||
gstreamer-pbutils-1.0 >= 1.0.0
|
||||
gtk+-3.0 >= 3.12.2
|
||||
- gudev-1.0 >= 145
|
||||
libexif >= 0.6.16
|
||||
libgphoto2 >= 2.5.0
|
||||
libraw >= 0.13.2
|
||||
@@ -8235,7 +8227,6 @@
|
||||
gstreamer-plugins-base-1.0 >= 1.0.0
|
||||
gstreamer-pbutils-1.0 >= 1.0.0
|
||||
gtk+-3.0 >= 3.12.2
|
||||
- gudev-1.0 >= 145
|
||||
libexif >= 0.6.16
|
||||
libgphoto2 >= 2.5.0
|
||||
libraw >= 0.13.2
|
10
graphics/shotwell/files/patch-configure.ac
Normal file
10
graphics/shotwell/files/patch-configure.ac
Normal file
|
@ -0,0 +1,10 @@
|
|||
--- configure.ac.orig 2017-03-26 06:57:42 UTC
|
||||
+++ configure.ac
|
||||
@@ -114,7 +114,6 @@ PKG_CHECK_MODULES(SHOTWELL, [
|
||||
gstreamer-plugins-base-1.0 >= 1.0.0
|
||||
gstreamer-pbutils-1.0 >= 1.0.0
|
||||
gtk+-3.0 >= 3.14.0
|
||||
- gudev-1.0 >= 145
|
||||
libexif >= 0.6.16
|
||||
libgphoto2 >= 2.5.0
|
||||
libraw >= 0.13.2
|
|
@ -1,6 +1,6 @@
|
|||
--- src/camera/CameraTable.vala.orig 2015-03-28 15:15:28.000000000 +0100
|
||||
+++ src/camera/CameraTable.vala 2015-03-28 15:20:51.000000000 +0100
|
||||
@@ -26,7 +26,6 @@
|
||||
--- src/camera/CameraTable.vala.orig 2017-02-25 22:55:36 UTC
|
||||
+++ src/camera/CameraTable.vala
|
||||
@@ -26,7 +26,6 @@ public class CameraTable {
|
||||
|
||||
private static CameraTable instance = null;
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
|||
private OneShotScheduler camera_update_scheduler = null;
|
||||
private GPhoto.Context null_context = new GPhoto.Context();
|
||||
private GPhoto.CameraAbilitiesList abilities_list;
|
||||
@@ -43,7 +42,6 @@
|
||||
@@ -43,7 +42,6 @@ public class CameraTable {
|
||||
on_update_cameras);
|
||||
|
||||
// listen for interesting events on the specified subsystems
|
||||
|
@ -16,7 +16,7 @@
|
|||
volume_monitor = VolumeMonitor.get();
|
||||
volume_monitor.volume_changed.connect(on_volume_changed);
|
||||
volume_monitor.volume_added.connect(on_volume_changed);
|
||||
@@ -107,36 +105,10 @@
|
||||
@@ -107,36 +105,10 @@ public class CameraTable {
|
||||
do_op(GPhoto.CameraAbilitiesList.create(out abilities_list), "create camera abilities list");
|
||||
do_op(abilities_list.load(null_context), "load camera abilities list");
|
||||
}
|
||||
|
@ -56,7 +56,7 @@
|
|||
}
|
||||
|
||||
// USB (or libusb) is a funny beast; if only one USB device is present (i.e. the camera),
|
||||
@@ -211,24 +183,8 @@
|
||||
@@ -211,24 +183,8 @@ public class CameraTable {
|
||||
return port.has_prefix("usb:") ?
|
||||
"/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null;
|
||||
}
|
||||
|
@ -83,7 +83,7 @@
|
|||
|
||||
private void update_camera_table() throws GPhotoError {
|
||||
// need to do this because virtual ports come and go in the USB world (and probably others)
|
||||
@@ -334,22 +290,7 @@
|
||||
@@ -326,22 +282,7 @@ public class CameraTable {
|
||||
}
|
||||
|
||||
// Get display name for camera.
|
||||
|
@ -107,7 +107,7 @@
|
|||
if (null == display_name) {
|
||||
// Default to GPhoto detected name.
|
||||
display_name = name;
|
||||
@@ -393,14 +334,8 @@
|
||||
@@ -381,14 +322,8 @@ public class CameraTable {
|
||||
camera_added(camera);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,8 @@
|
|||
bin/shotwell
|
||||
lib/libshotwell-authenticator.a
|
||||
lib/libshotwell-authenticator.so
|
||||
lib/libshotwell-authenticator.so.0
|
||||
lib/libshotwell-authenticator.so.0.0.0
|
||||
lib/libshotwell-plugin-common.a
|
||||
lib/libshotwell-plugin-common.so
|
||||
lib/libshotwell-plugin-common.so.0
|
||||
|
@ -271,6 +275,49 @@ share/help/hu/shotwell/share-upload.page
|
|||
share/help/hu/shotwell/view-displaying.page
|
||||
share/help/hu/shotwell/view-information.page
|
||||
share/help/hu/shotwell/view-sidebar.page
|
||||
share/help/lv/shotwell/edit-adjustments.page
|
||||
share/help/lv/shotwell/edit-crop.page
|
||||
share/help/lv/shotwell/edit-date-time.page
|
||||
share/help/lv/shotwell/edit-enhance.page
|
||||
share/help/lv/shotwell/edit-external.page
|
||||
share/help/lv/shotwell/edit-nondestructive.page
|
||||
share/help/lv/shotwell/edit-redeye.page
|
||||
share/help/lv/shotwell/edit-rotate.page
|
||||
share/help/lv/shotwell/edit-straighten.page
|
||||
share/help/lv/shotwell/edit-undo.page
|
||||
share/help/lv/shotwell/figures/crop_thirds.jpg
|
||||
share/help/lv/shotwell/figures/edit_toolbar.png
|
||||
share/help/lv/shotwell/figures/editing_overview.png
|
||||
share/help/lv/shotwell/figures/shotwell_logo.png
|
||||
share/help/lv/shotwell/figures/trash_process.png
|
||||
share/help/lv/shotwell/formats.page
|
||||
share/help/lv/shotwell/import-camera.page
|
||||
share/help/lv/shotwell/import-f-spot.page
|
||||
share/help/lv/shotwell/import-file.page
|
||||
share/help/lv/shotwell/import-memorycard.page
|
||||
share/help/lv/shotwell/index.page
|
||||
share/help/lv/shotwell/organize-event.page
|
||||
share/help/lv/shotwell/organize-flag.page
|
||||
share/help/lv/shotwell/organize-rating.page
|
||||
share/help/lv/shotwell/organize-remove.page
|
||||
share/help/lv/shotwell/organize-search.page
|
||||
share/help/lv/shotwell/organize-tag.page
|
||||
share/help/lv/shotwell/organize-title.page
|
||||
share/help/lv/shotwell/other-files.page
|
||||
share/help/lv/shotwell/other-missing.page
|
||||
share/help/lv/shotwell/other-multiple.page
|
||||
share/help/lv/shotwell/other-plugins.page
|
||||
share/help/lv/shotwell/raw.page
|
||||
share/help/lv/shotwell/running.page
|
||||
share/help/lv/shotwell/share-background.page
|
||||
share/help/lv/shotwell/share-export.page
|
||||
share/help/lv/shotwell/share-print.page
|
||||
share/help/lv/shotwell/share-send.page
|
||||
share/help/lv/shotwell/share-slideshow.page
|
||||
share/help/lv/shotwell/share-upload.page
|
||||
share/help/lv/shotwell/view-displaying.page
|
||||
share/help/lv/shotwell/view-information.page
|
||||
share/help/lv/shotwell/view-sidebar.page
|
||||
share/help/pt_BR/shotwell/edit-adjustments.page
|
||||
share/help/pt_BR/shotwell/edit-crop.page
|
||||
share/help/pt_BR/shotwell/edit-date-time.page
|
||||
|
@ -430,76 +477,3 @@ share/locale/vi/LC_MESSAGES/shotwell.mo
|
|||
share/locale/zh_CN/LC_MESSAGES/shotwell.mo
|
||||
share/locale/zh_HK/LC_MESSAGES/shotwell.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/shotwell.mo
|
||||
%%DATADIR%%/icons/all-rejected.png
|
||||
%%DATADIR%%/icons/crop-pivot-reticle.png
|
||||
%%DATADIR%%/icons/crop.svg
|
||||
%%DATADIR%%/icons/drag_nub.png
|
||||
%%DATADIR%%/icons/faces-tool.png
|
||||
%%DATADIR%%/icons/filter-flagged.png
|
||||
%%DATADIR%%/icons/filter-photos.png
|
||||
%%DATADIR%%/icons/filter-raw.png
|
||||
%%DATADIR%%/icons/filter-videos.png
|
||||
%%DATADIR%%/icons/five-star-filter.svg
|
||||
%%DATADIR%%/icons/five-stars.svg
|
||||
%%DATADIR%%/icons/flag-page.png
|
||||
%%DATADIR%%/icons/flag-trinket.png
|
||||
%%DATADIR%%/icons/four-star-filter-plus.svg
|
||||
%%DATADIR%%/icons/four-stars.svg
|
||||
%%DATADIR%%/icons/generic-plugin.png
|
||||
%%DATADIR%%/icons/image-adjust.svg
|
||||
%%DATADIR%%/icons/import-all.png
|
||||
%%DATADIR%%/icons/import.svg
|
||||
%%DATADIR%%/icons/make-primary.svg
|
||||
%%DATADIR%%/icons/many-faces.png
|
||||
%%DATADIR%%/icons/merge.svg
|
||||
%%DATADIR%%/icons/multiple-events.png
|
||||
%%DATADIR%%/icons/multiple-tags.png
|
||||
%%DATADIR%%/icons/no-event.png
|
||||
%%DATADIR%%/icons/noninterpretable-video.png
|
||||
%%DATADIR%%/icons/one-event.png
|
||||
%%DATADIR%%/icons/one-face.png
|
||||
%%DATADIR%%/icons/one-star-filter-plus.svg
|
||||
%%DATADIR%%/icons/one-star.svg
|
||||
%%DATADIR%%/icons/one-tag.png
|
||||
%%DATADIR%%/icons/pin-toolbar.svg
|
||||
%%DATADIR%%/icons/publish.png
|
||||
%%DATADIR%%/icons/redeye.png
|
||||
%%DATADIR%%/icons/rejected.svg
|
||||
%%DATADIR%%/icons/shotwell-16.png
|
||||
%%DATADIR%%/icons/shotwell-auto-enhance.png
|
||||
%%DATADIR%%/icons/shotwell-street.jpg
|
||||
%%DATADIR%%/icons/shotwell.png
|
||||
%%DATADIR%%/icons/slideshow-extension-point.png
|
||||
%%DATADIR%%/icons/sprocket.png
|
||||
%%DATADIR%%/icons/straighten.svg
|
||||
%%DATADIR%%/icons/three-star-filter-plus.svg
|
||||
%%DATADIR%%/icons/three-stars.svg
|
||||
%%DATADIR%%/icons/two-star-filter-plus.svg
|
||||
%%DATADIR%%/icons/two-stars.svg
|
||||
%%DATADIR%%/icons/videos-page.png
|
||||
%%DATADIR%%/icons/zoom-in.png
|
||||
%%DATADIR%%/icons/zoom-out.png
|
||||
%%DATADIR%%/ui/collection.ui
|
||||
%%DATADIR%%/ui/direct.ui
|
||||
%%DATADIR%%/ui/direct_context.ui
|
||||
%%DATADIR%%/ui/event.ui
|
||||
%%DATADIR%%/ui/events_directory.ui
|
||||
%%DATADIR%%/ui/fullscreen.ui
|
||||
%%DATADIR%%/ui/import.ui
|
||||
%%DATADIR%%/ui/import_queue.ui
|
||||
%%DATADIR%%/ui/media.ui
|
||||
%%DATADIR%%/ui/offline.ui
|
||||
%%DATADIR%%/ui/photo.ui
|
||||
%%DATADIR%%/ui/photo_context.ui
|
||||
%%DATADIR%%/ui/savedsearch.ui
|
||||
%%DATADIR%%/ui/search_bar.ui
|
||||
%%DATADIR%%/ui/search_sidebar_context.ui
|
||||
%%DATADIR%%/ui/set_background_dialog.ui
|
||||
%%DATADIR%%/ui/set_background_slideshow_dialog.ui
|
||||
%%DATADIR%%/ui/shotwell.ui
|
||||
%%DATADIR%%/ui/shotwell.xml
|
||||
%%DATADIR%%/ui/sidebar_default_context.ui
|
||||
%%DATADIR%%/ui/tag_sidebar_context.ui
|
||||
%%DATADIR%%/ui/tags.ui
|
||||
%%DATADIR%%/ui/top.ui
|
||||
%%DATADIR%%/ui/trash.ui
|
||||
|
|
Loading…
Reference in a new issue