Attachment #169813 for bug #209152

View | Details | Raw Unified | Return to bug 209152
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	geeqie
PORTVERSION=	1.2.3
PORTREVISION=	4
CATEGORIES=	graphics
MASTER_SITES=	http://www.geeqie.org/

MAINTAINER=	amdmi3@FreeBSD.org
COMMENT=	Lightweight image viewer forked from GQview

LICENSE=	GPLv2

LIB_DEPENDS=	libpng.so:graphics/png

USES=		autoreconf gettext gmake jpeg localbase pkgconfig \
		desktop-file-utils tar:xz
USE_GNOME=	gtk30 intltool
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-readmedir="${DOCSDIR}"
		--htmldir="${DOCSDIR}/html" \
		--with-htmldir="${DOCSDIR}/html" \
		--with-readmedir="${DOCSDIR}"

OPTIONS_DEFINE=	EXIV2 LCMS LIRC GPS TIFF
CPPFLAGS+=	${CFLAGS}
LDFLAGS+=	-L${LOCALBASE}/lib
MAKE_ARGS+=	top_builddir="${WRKSRC}"

PORTDOCS=	*

OPTIONS_DEFINE=	EXIV2 LCMS LIRC GPS DOCS
OPTIONS_DEFAULT=EXIV2 LCMS
EXIV2_DESC=	Metadata editing
LCMS_DESC=	Color adjusting

EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
EXIV2_CONFIGURE_ENABLE=	exiv2

LCMS_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
LCMS_CONFIGURE_ENABLE=	lcms

LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
LIRC_CONFIGURE_ENABLE=	lirc

GPS_LIB_DEPENDS=	libchamplain-0.12.so:graphics/libchamplain \
			libclutter-gtk-1.0.so:graphics/clutter-gtk3
GPS_CONFIGURE_ENABLE=	gps clutter

TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
TIFF_CONFIGURE_ENABLE=	tiff

post-patch:
	@${REINPLACE_CMD} -e 's|champlain-0\.4|champlain-0.8|g; \
		s|champlain-gtk-0\.4|champlain-gtk-0.8|g' \
		${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|MAP_ANONYMOUS|MAP_ANON|' ${WRKSRC}/src/main.c
	@${REINPLACE_CMD} -e 's| -r %F||' ${WRKSRC}/geeqie.desktop.in
# I cannot get gnome-doc-tool working properly: Outputs gibberish
	@${REINPLACE_CMD} -Ee '/^(SUBDIRS|DIST_SUBDIRS)/ s|doc||' \
		${WRKSRC}/Makefile.am

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (geeqie-1.1.tar.gz) = 5544e81c29917a647f19bfe800d9f0dd1cd5b890329feebd9abd80927e1afecf	1	SHA256 (geeqie-1.2.3.tar.xz) = 2629bf33a9070fad4804b1ef051c3bf8a8fdad3bba4e6188dc20588185003248
2	SIZE (geeqie-1.1.tar.gz) = 1966211	2	SIZE (geeqie-1.2.3.tar.xz) = 1129804




--- plugins/ufraw/geeqie-ufraw.orig	2010-02-18 00:21:15.000000000 +0300
+++ plugins/ufraw/geeqie-ufraw	2010-05-22 17:06:21.000000000 +0400
@@ -37,7 +37,7 @@
 
     basename=${input%.*}
     dirname=${basename%/*}
-    xmp=`find "$dirname" -maxdepth 1 -path "$basename.*" -regextype posix-egrep -iregex "$XMP_REGEX" -print | head -n 1`
+    xmp=`find -E "$dirname" -maxdepth 1 -path "$basename.*" -iregex "$XMP_REGEX" -print | head -n 1`
     [ -f "$xmp" ] || return 1
 
     output=`get_output_from_id "$idfile"`
@@ -75,7 +75,7 @@
     rawfile=$1
     basename=${rawfile%.*}
     dirname=${basename%/*}
-    outfiles=`find "$dirname" -maxdepth 1 -path "$basename.*" -regextype posix-egrep \( -iregex "$OUT_REGEX" -o -regex "$ID_REGEX" \) -print `
+    outfiles=`find -E "$dirname" -maxdepth 1 -path "$basename.*" \( -iregex "$OUT_REGEX" -o -regex "$ID_REGEX" \) -print `
     [ -z "$outfiles" ] # return true if no possible output file exists
 
     # raw+jpeg pair created by the camera is considered processed, 
@@ -136,12 +136,12 @@
 {
     list=`mktemp /tmp/geeqie-ufraw-list.XXXXXXXXXX` || exit 1
 
-    find "$@" -regextype posix-egrep -iregex "$RAW_REGEX" -print | while read rawfile ; do
+    find -E "$@" -iregex "$RAW_REGEX" -print | while read rawfile ; do
         raw_file_not_processed "$rawfile" && echo "$rawfile" 
     done >>$list
     
     #refresh output from changed id files
-    find "$@" -regextype posix-egrep -regex "$ID_REGEX" -print | while read idfile ; do
+    find -E "$@" -regex "$ID_REGEX" -print | while read idfile ; do
         id_file_changed "$idfile" && echo "$idfile"
     done >>$list
 




--- plugins/ufraw/geeqie-ufraw.orig	2016-03-07 10:21:06 UTC
+++ plugins/ufraw/geeqie-ufraw
@@ -37,7 +37,7 @@ add_xmp_from_sidecar ()
 
     basename=${input%.*}
     dirname=${basename%/*}

     [ -f "$xmp" ] || return 1
 
     output=`get_output_from_id "$idfile"`
@@ -75,7 +75,7 @@ raw_file_not_processed ()
     rawfile=$1
     basename=${rawfile%.*}
     dirname=${basename%/*}

     [ -z "$outfiles" ] # return true if no possible output file exists
 
     # raw+jpeg pair created by the camera is considered processed, 
@@ -136,12 +136,12 @@ process_tree ()
 {
     list=`mktemp /tmp/geeqie-ufraw-list.XXXXXXXXXX` || exit 1
 




From 411ef45d8fbda079d51abeba997017e9508fa7a7 Mon Sep 17 00:00:00 2001
From: Colin Clark <cclark@mcb.net>
Date: Tue, 29 Mar 2016 18:18:05 +0100
Subject: [PATCH 1/1] Update for new cogl version

Parameters for cogl_texture_3d_new_from_data have changed.

--- src/renderer-clutter.c.orig	2016-03-07 10:21:06 UTC
+++ src/renderer-clutter.c
@@ -234,7 +234,19 @@ static void rc_prepare_post_process_lut(
 	g_object_unref(tmp_pixbuf);
 
 	DEBUG_0("%s clut upload start", get_exec_time());
-#if CLUTTER_CHECK_VERSION(1,10,0)
+#if COGL_VERSION_CHECK(1,18,2)
+	{
+	CoglContext *ctx = clutter_backend_get_cogl_context(clutter_get_default_backend ());
+
+	tex3d = cogl_texture_3d_new_from_data(ctx,
+					      CLUT_SIZE, CLUT_SIZE, CLUT_SIZE,
+					      COGL_PIXEL_FORMAT_RGB_888,
+					      CLUT_SIZE * 3,
+					      CLUT_SIZE * CLUT_SIZE * 3,
+					      clut,
+					      NULL);
+	}
+#elif COGL_VERSION_CHECK(1,10,4)
 	{
 	CoglContext *ctx = clutter_backend_get_cogl_context(clutter_get_default_backend ());
 

Lines 12-15 Link Here

(-)pkg-descr (-1 / +1 lines)
12	contact gqview author and the only maintainer. Geeqie projects goal is to move	12	contact gqview author and the only maintainer. Geeqie projects goal is to move
13	the development forward and also integrate the existing patches.	13	the development forward and also integrate the existing patches.
14		14
15	WWW: http://geeqie.sourceforge.net/	15	WWW: http://www.geeqie.org/

Lines 5-10 Link Here

(-)pkg-plist (+5 lines)
5	lib/geeqie/geeqie-ufraw	5	lib/geeqie/geeqie-ufraw
6	man/man1/geeqie.1.gz	6	man/man1/geeqie.1.gz
7	share/applications/geeqie.desktop	7	share/applications/geeqie.desktop
		8	%%DOCSDIR%%/COPYING
		9	%%DOCSDIR%%/ChangeLog
		10	%%DOCSDIR%%/README
		11	%%DOCSDIR%%/README.lirc
		12	%%DOCSDIR%%/TODO
8	%%DATADIR%%/applications/geeqie-import-geeqie.desktop	13	%%DATADIR%%/applications/geeqie-import-geeqie.desktop
9	%%DATADIR%%/applications/geeqie-import-gqview.desktop	14	%%DATADIR%%/applications/geeqie-import-gqview.desktop
10	%%DATADIR%%/applications/geeqie-ufraw-id.desktop	15	%%DATADIR%%/applications/geeqie-ufraw-id.desktop

Return to bug 209152

Lines 2-33 Link Here

(-)Makefile (-25 / +18 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= geeqie	4	PORTNAME= geeqie
5	PORTVERSION= 1.1	5	PORTVERSION= 1.2.3
6	PORTREVISION= 4
7	CATEGORIES= graphics	6	CATEGORIES= graphics
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}	7	MASTER_SITES= http://www.geeqie.org/
9		8
10	MAINTAINER= amdmi3@FreeBSD.org	9	MAINTAINER= amdmi3@FreeBSD.org
11	COMMENT= Lightweight image viewer forked from GQview	10	COMMENT= Lightweight image viewer forked from GQview
12		11
		12	LICENSE= GPLv2
		13
13	LIB_DEPENDS= libpng.so:graphics/png	14	LIB_DEPENDS= libpng.so:graphics/png
14		15
15	USES= gettext gmake pkgconfig desktop-file-utils	16	USES= autoreconf gettext gmake jpeg localbase pkgconfig \
16	USE_GNOME= gtk20 intltool	17	desktop-file-utils tar:xz
		18	USE_GNOME= gtk30 intltool
17	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS= --docdir="${DOCSDIR}" \	20	CONFIGURE_ARGS= --with-readmedir="${DOCSDIR}"
19	--htmldir="${DOCSDIR}/html" \
20	--with-htmldir="${DOCSDIR}/html" \
21	--with-readmedir="${DOCSDIR}"
22		21
23	CFLAGS+= -I${LOCALBASE}/include	22	OPTIONS_DEFINE= EXIV2 LCMS LIRC GPS TIFF
24	CPPFLAGS+= ${CFLAGS}
25	LDFLAGS+= -L${LOCALBASE}/lib
26	MAKE_ARGS+= top_builddir="${WRKSRC}"
27
28	PORTDOCS= *
29
30	OPTIONS_DEFINE= EXIV2 LCMS LIRC GPS DOCS
31	OPTIONS_DEFAULT=EXIV2 LCMS	23	OPTIONS_DEFAULT=EXIV2 LCMS
32	EXIV2_DESC= Metadata editing	24	EXIV2_DESC= Metadata editing
33	LCMS_DESC= Color adjusting	25	LCMS_DESC= Color adjusting
Lines 37-59 Link Here
37	EXIV2_LIB_DEPENDS= libexiv2.so:graphics/exiv2	29	EXIV2_LIB_DEPENDS= libexiv2.so:graphics/exiv2
38	EXIV2_CONFIGURE_ENABLE= exiv2	30	EXIV2_CONFIGURE_ENABLE= exiv2
39		31
40	LCMS_LIB_DEPENDS= liblcms.so:graphics/lcms	32	LCMS_LIB_DEPENDS= liblcms2.so:graphics/lcms2
41	LCMS_CONFIGURE_ENABLE= lcms	33	LCMS_CONFIGURE_ENABLE= lcms
42		34
43	LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc	35	LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc
44	LIRC_CONFIGURE_ENABLE= lirc	36	LIRC_CONFIGURE_ENABLE= lirc
45		37
46	GPS_LIB_DEPENDS= libchamplain-0.8.so:graphics/libchamplain08	38	GPS_LIB_DEPENDS= libchamplain-0.12.so:graphics/libchamplain \
47	GPS_CONFIGURE_ENABLE= gps	39	libclutter-gtk-1.0.so:graphics/clutter-gtk3
		40	GPS_CONFIGURE_ENABLE= gps clutter
48		41
		42	TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
		43	TIFF_CONFIGURE_ENABLE= tiff
		44
49	post-patch:	45	post-patch:
50	@${REINPLACE_CMD} -e 's\|champlain-0\.4\|champlain-0.8\|g; \
51	s\|champlain-gtk-0\.4\|champlain-gtk-0.8\|g' \
52	${WRKSRC}/configure
53	@${REINPLACE_CMD} -e 's\|MAP_ANONYMOUS\|MAP_ANON\|' ${WRKSRC}/src/main.c	46	@${REINPLACE_CMD} -e 's\|MAP_ANONYMOUS\|MAP_ANON\|' ${WRKSRC}/src/main.c
54	@${REINPLACE_CMD} -e 's\| -r %F\|\|' ${WRKSRC}/geeqie.desktop	47	@${REINPLACE_CMD} -e 's\| -r %F\|\|' ${WRKSRC}/geeqie.desktop.in
55	# I cannot get gnome-doc-tool working properly: Outputs gibberish	48	# I cannot get gnome-doc-tool working properly: Outputs gibberish
56	@${REINPLACE_CMD} -Ee '/^(SUBDIRS\|DIST_SUBDIRS)/ s\|doc\|\|' \	49	@${REINPLACE_CMD} -Ee '/^(SUBDIRS\|DIST_SUBDIRS)/ s\|doc\|\|' \
57	${WRKSRC}/Makefile.in	50	${WRKSRC}/Makefile.am
58		51
59	.include <bsd.port.mk>	52	.include <bsd.port.mk>

Lines 1-35 Link Here

(-)files/patch-plugins-ufraw-geeqie-ufraw (-35 lines)
1	--- plugins/ufraw/geeqie-ufraw.orig 2010-02-18 00:21:15.000000000 +0300
2	+++ plugins/ufraw/geeqie-ufraw 2010-05-22 17:06:21.000000000 +0400
3	@@ -37,7 +37,7 @@
4
5	basename=${input%.*}
6	dirname=${basename%/*}
7	- xmp=`find "$dirname" -maxdepth 1 -path "$basename.*" -regextype posix-egrep -iregex "$XMP_REGEX" -print \| head -n 1`
8	+ xmp=`find -E "$dirname" -maxdepth 1 -path "$basename.*" -iregex "$XMP_REGEX" -print \| head -n 1`
9	[ -f "$xmp" ] \|\| return 1
10
11	output=`get_output_from_id "$idfile"`
12	@@ -75,7 +75,7 @@
13	rawfile=$1
14	basename=${rawfile%.*}
15	dirname=${basename%/*}
16	- outfiles=`find "$dirname" -maxdepth 1 -path "$basename.*" -regextype posix-egrep \( -iregex "$OUT_REGEX" -o -regex "$ID_REGEX" \) -print `
17	+ outfiles=`find -E "$dirname" -maxdepth 1 -path "$basename.*" \( -iregex "$OUT_REGEX" -o -regex "$ID_REGEX" \) -print `
18	[ -z "$outfiles" ] # return true if no possible output file exists
19
20	# raw+jpeg pair created by the camera is considered processed,
21	@@ -136,12 +136,12 @@
22	{
23	list=`mktemp /tmp/geeqie-ufraw-list.XXXXXXXXXX` \|\| exit 1
24
25	- find "$@" -regextype posix-egrep -iregex "$RAW_REGEX" -print \| while read rawfile ; do
26	+ find -E "$@" -iregex "$RAW_REGEX" -print \| while read rawfile ; do
27	raw_file_not_processed "$rawfile" && echo "$rawfile"
28	done >>$list
29
30	#refresh output from changed id files
31	- find "$@" -regextype posix-egrep -regex "$ID_REGEX" -print \| while read idfile ; do
32	+ find -E "$@" -regex "$ID_REGEX" -print \| while read idfile ; do
33	id_file_changed "$idfile" && echo "$idfile"
34	done >>$list
35

Lines 1-6 Link Here

(-)files/patch-plugins_ufraw_geeqie-ufraw (-5 / +5 lines)
1	--- plugins/ufraw/geeqie-ufraw.orig 2010-02-18 00:21:15.000000000 +0300	1	--- plugins/ufraw/geeqie-ufraw.orig 2016-03-07 10:21:06 UTC
2	+++ plugins/ufraw/geeqie-ufraw 2010-05-22 17:06:21.000000000 +0400	2	+++ plugins/ufraw/geeqie-ufraw
3	@@ -37,7 +37,7 @@	3	@@ -37,7 +37,7 @@ add_xmp_from_sidecar ()
4		4
5	basename=${input%.*}	5	basename=${input%.*}
6	dirname=${basename%/*}	6	dirname=${basename%/*}
Lines 9-15 Link Here
9	[ -f "$xmp" ] \|\| return 1	9	[ -f "$xmp" ] \|\| return 1
10		10
11	output=`get_output_from_id "$idfile"`	11	output=`get_output_from_id "$idfile"`
12	@@ -75,7 +75,7 @@	12	@@ -75,7 +75,7 @@ raw_file_not_processed ()
13	rawfile=$1	13	rawfile=$1
14	basename=${rawfile%.*}	14	basename=${rawfile%.*}
15	dirname=${basename%/*}	15	dirname=${basename%/*}
Lines 18-24 Link Here
18	[ -z "$outfiles" ] # return true if no possible output file exists	18	[ -z "$outfiles" ] # return true if no possible output file exists
19		19
20	# raw+jpeg pair created by the camera is considered processed,	20	# raw+jpeg pair created by the camera is considered processed,
21	@@ -136,12 +136,12 @@	21	@@ -136,12 +136,12 @@ process_tree ()
22	{	22	{
23	list=`mktemp /tmp/geeqie-ufraw-list.XXXXXXXXXX` \|\| exit 1	23	list=`mktemp /tmp/geeqie-ufraw-list.XXXXXXXXXX` \|\| exit 1
24		24

Line 0 Link Here

(-)files/patch-src_renderer-clutter.c (+30 lines)
	1	From 411ef45d8fbda079d51abeba997017e9508fa7a7 Mon Sep 17 00:00:00 2001
	2	From: Colin Clark <cclark@mcb.net>
	3	Date: Tue, 29 Mar 2016 18:18:05 +0100
	4	Subject: [PATCH 1/1] Update for new cogl version
	5
	6	Parameters for cogl_texture_3d_new_from_data have changed.
	7
	8	--- src/renderer-clutter.c.orig 2016-03-07 10:21:06 UTC
	9	+++ src/renderer-clutter.c
	10	@@ -234,7 +234,19 @@ static void rc_prepare_post_process_lut(
	11	g_object_unref(tmp_pixbuf);
	12
	13	DEBUG_0("%s clut upload start", get_exec_time());
	14	-#if CLUTTER_CHECK_VERSION(1,10,0)
	15	+#if COGL_VERSION_CHECK(1,18,2)
	16	+ {
	17	+ CoglContext *ctx = clutter_backend_get_cogl_context(clutter_get_default_backend ());
	18	+
	19	+ tex3d = cogl_texture_3d_new_from_data(ctx,
	20	+ CLUT_SIZE, CLUT_SIZE, CLUT_SIZE,
	21	+ COGL_PIXEL_FORMAT_RGB_888,
	22	+ CLUT_SIZE * 3,
	23	+ CLUT_SIZE * CLUT_SIZE * 3,
	24	+ clut,
	25	+ NULL);
	26	+ }
	27	+#elif COGL_VERSION_CHECK(1,10,4)
	28	{
	29	CoglContext *ctx = clutter_backend_get_cogl_context(clutter_get_default_backend ());
	30