Date: Sat, 22 Nov 2008 16:15:34 GMT From: Kuan-Chung Chiu <buganini@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: misc/129068: [Maintainer Update] graphics/seam-carving-gui 1.10 Message-ID: <200811221615.mAMGFYql071770@www.freebsd.org> Resent-Message-ID: <200811221620.mAMGK1mO000812@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 129068
>Category: misc
>Synopsis: [Maintainer Update] graphics/seam-carving-gui 1.10
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Nov 22 16:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Kuan-Chung Chiu
>Release: 8-CURRENT
>Organization:
N/A
>Environment:
FreeBSD Raptor.twbbs.org 8.0-CURRENT FreeBSD 8.0-CURRENT #4: Thu Nov 20 21:12:19 CST 2008 root@Raptor.twbbs.org:/usr/obj/usr/src/sys/RAPTOR i386
>Description:
Update graphics/seam-carving-gui from 1.9 to 1.10
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN seam-carving-gui.orig/Makefile seam-carving-gui/Makefile
--- seam-carving-gui.orig/Makefile 2008-11-22 23:36:55.000000000 +0800
+++ seam-carving-gui/Makefile 2008-11-23 00:00:11.000000000 +0800
@@ -6,7 +6,7 @@
#
PORTNAME= seam-carving-gui
-PORTVERSION= 1.9
+PORTVERSION= 1.10
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
@@ -23,6 +23,12 @@
PLIST_FILES= bin/SeamCarvingGui
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == amd64
+EXTRA_PATCHES= ${PATCHDIR}/amd64-CAIR.cpp
+.endif
+
do-configure:
cd ${WRKSRC} && \
${SETENV} QMAKESPEC="${QMAKESPEC}" ${QMAKE} seam-carving-gui.pro
@@ -30,4 +36,4 @@
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/SeamCarvingGui ${PREFIX}/bin
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN seam-carving-gui.orig/distinfo seam-carving-gui/distinfo
--- seam-carving-gui.orig/distinfo 2008-11-22 23:36:55.000000000 +0800
+++ seam-carving-gui/distinfo 2008-11-22 23:48:38.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (seam-carving-gui-1.9.tar.gz) = c1e6de3fa63897a5fa3522789ea2e87c
-SHA256 (seam-carving-gui-1.9.tar.gz) = ccd2db1106e99d78c552db41a443fac83b90b6b771cdc0d0392cb61d79649a2c
-SIZE (seam-carving-gui-1.9.tar.gz) = 124404
+MD5 (seam-carving-gui-1.10.tar.gz) = 38ff9e6f1284a84c76730f18fd5d26f0
+SHA256 (seam-carving-gui-1.10.tar.gz) = 0d626b0f1653fc21dadd3c1c79fa56ca1a59a280ee5d9292da7a15271006a568
+SIZE (seam-carving-gui-1.10.tar.gz) = 130729
diff -ruN seam-carving-gui.orig/files/amd64-CAIR.cpp seam-carving-gui/files/amd64-CAIR.cpp
--- seam-carving-gui.orig/files/amd64-CAIR.cpp 1970-01-01 08:00:00.000000000 +0800
+++ seam-carving-gui/files/amd64-CAIR.cpp 2008-11-23 00:05:26.000000000 +0800
@@ -0,0 +1,56 @@
+--- cair/CAIR.cpp.orig 2008-11-09 07:00:12.000000000 +0800
++++ cair/CAIR.cpp 2008-11-23 00:04:33.000000000 +0800
+@@ -260,7 +260,7 @@
+ //Our thread function for the Grayscale
+ void * Gray_Quadrant( void * id )
+ {
+- int num = (int)id;
++ long int num = (long int)id;
+
+ while( true )
+ {
+@@ -425,7 +425,7 @@
+ //The thread function, splitting the image into strips
+ void * Edge_Quadrant( void * id )
+ {
+- int num = (int)id;
++ long int num = (long int)id;
+
+ while( true )
+ {
+@@ -619,7 +619,7 @@
+ //=========================================================================================================//
+ void * Energy_Left( void * id )
+ {
+- int num = (int)id;
++ long int num = (long int)id;
+ int energy = 0;// current calculated enery
+ int min_x = 0, max_x = 0;
+
+@@ -734,7 +734,7 @@
+ //=========================================================================================================//
+ void * Energy_Right( void * id )
+ {
+- int num = (int)id;
++ long int num = (long int)id;
+ int energy = 0;// current calculated enery
+ int min_x = 0, max_x = 0;
+
+@@ -945,7 +945,7 @@
+ //This works like Remove_Quadrant, stripes across the image.
+ void * Add_Quadrant( void * id )
+ {
+- int num = (int)id;
++ long int num = (long int)id;
+ Thread_Params add_area;
+
+ while( true )
+@@ -1260,7 +1260,7 @@
+ //the areas are not quadrants, rather, more like strips, but I keep the name convention
+ void * Remove_Quadrant( void * id )
+ {
+- int num = (int)id;
++ long int num = (long int)id;
+ Thread_Params remove_area;
+
+ while( true )
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811221615.mAMGFYql071770>