Attachment 160918 Details for Bug 203034 – patch

[patch] patch

lightzone-4.1.2.patch (text/plain), 4.06 KB, created by Yuri Victorovich on 2015-09-11 01:43:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2015-09-11 01:43:36 UTC

Size: 4.06 KB

patch

obsolete

>diff -ruN graphics/lightzone/Makefile graphics/lightzone.new/Makefile
>--- graphics/lightzone/Makefile	2015-09-10 18:38:29.742525000 -0700
>+++ graphics/lightzone.new/Makefile	2015-09-10 15:59:34.699067000 -0700
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/graphics/lightzone/Makefile 390585 2015-06-25 16:49:13Z antoine $
> 
> PORTNAME=	lightzone
>-DISTVERSION=	4.1.1
>-PORTREVISION=	1
>+DISTVERSION=	4.1.2
> CATEGORIES=	graphics java
> DIST_SUBDIR=	${PORTNAME}
> 
>diff -ruN graphics/lightzone/distinfo graphics/lightzone.new/distinfo
>--- graphics/lightzone/distinfo	2015-09-10 18:38:29.642599000 -0700
>+++ graphics/lightzone.new/distinfo	2015-09-10 16:10:11.250037000 -0700
>@@ -1,2 +1,2 @@
>-SHA256 (lightzone/ktgw0316-LightZone-4.1.1_GH0.tar.gz) = 30ba265ceb101cc89a12c44849cadfffa0458445c92d20678904c4fbced3be3d
>-SIZE (lightzone/ktgw0316-LightZone-4.1.1_GH0.tar.gz) = 26478012
>+SHA256 (lightzone/ktgw0316-LightZone-4.1.2_GH0.tar.gz) = 46d9a849e500eaa403fd7c8f03220828a9283ec96a45b2d51aa2adff5da5ecce
>+SIZE (lightzone/ktgw0316-LightZone-4.1.2_GH0.tar.gz) = 23686103
>diff -ruN graphics/lightzone/files/patch-products_lightzone graphics/lightzone.new/files/patch-products_lightzone
>--- graphics/lightzone/files/patch-products_lightzone	2015-09-10 18:38:29.700476000 -0700
>+++ graphics/lightzone.new/files/patch-products_lightzone	2015-09-10 16:12:37.875222000 -0700
>@@ -1,15 +1,6 @@
>---- products/lightzone.orig	2015-06-02 13:25:15 UTC
>+--- products/lightzone.orig	2015-08-04 13:37:11 UTC
> +++ products/lightzone
>-@@ -15,19 +15,13 @@ elif [ "${PLATFORM}" = "SunOS" ]; then
>-   totalmem=`expr $totalmem \* 1024`
>-   usrdir=/usr
>- elif [ "${PLATFORM}" = "FreeBSD" ]; then
>--  totalmem=`dmesg | grep 'real memory' | sed -r 's/.* ([0-9]+) .*/\1/'`
>--  totalmem=`expr $totalmem / 1024`
>--  usrdir=/usr/local
>-+  totalmem=`sysctl -n hw.physmem`
>-+  totalmem=$(($totalmem / 1024))
>-+  usrdir=%%LOCALBASE%%
>+@@ -21,13 +21,7 @@ elif [ "${PLATFORM}" = "FreeBSD" ]; then
>  fi
>  
>  pkgjavadir=${usrdir}/share/java/lightzone
>diff -ruN graphics/lightzone/files/patch-src_com_lightcrafts_platform_linux_TestSSE2.java graphics/lightzone.new/files/patch-src_com_lightcrafts_platform_linux_TestSSE2.java
>--- graphics/lightzone/files/patch-src_com_lightcrafts_platform_linux_TestSSE2.java	2015-09-10 18:38:29.680507000 -0700
>+++ graphics/lightzone.new/files/patch-src_com_lightcrafts_platform_linux_TestSSE2.java	1969-12-31 16:00:00.000000000 -0800
>@@ -1,29 +0,0 @@
>---- src/com/lightcrafts/platform/linux/TestSSE2.java.orig	2015-06-02 13:25:15 UTC
>-+++ src/com/lightcrafts/platform/linux/TestSSE2.java
>-@@ -29,6 +29,8 @@ class TestSSE2 {
>-             regex = "^flags\t\t:.*sse2";
>-         } else if (osname.indexOf("SunOS") >= 0) {
>-             regex = "^\t.*sse2";
>-+        } else if (osname.indexOf("FreeBSD") >= 0) {
>-+            regex = "^hw.instruction_sse: 1";
>-         } else {
>-             regex = "^  Features=.*SSE2";
>-         }
>-@@ -42,6 +44,8 @@ class TestSSE2 {
>-             cmd = new String[] {"cat", "/proc/cpuinfo"};
>-         } else if (osname.indexOf("SunOS") >= 0) {
>-             cmd = new String[] {"sh", "-c", "isainfo -nv ; psrinfo -pv"};
>-+        } else if (osname.indexOf("FreeBSD") >= 0) {
>-+            cmd = new String[] {"/sbin/sysctl", "hw"};
>-         } else {
>-             cmd = new String[] {"dmesg"};
>-         }
>-@@ -68,6 +72,8 @@ class TestSSE2 {
>-             regex = getCpuInfoLine("^model name\t: ");
>-         } else if (osname.indexOf("SunOS") >= 0) {
>-             regex = getCpuInfoLine("^\t");
>-+        } else if (osname.indexOf("FreeBSD") >= 0) {
>-+            regex = getCpuInfoLine("^hw.model: ");
>-         } else {
>-             regex = getCpuInfoLine("^CPU: ");
>-         }
>diff -ruN graphics/lightzone/pkg-plist graphics/lightzone.new/pkg-plist
>--- graphics/lightzone/pkg-plist	2015-09-10 18:38:29.720490000 -0700
>+++ graphics/lightzone.new/pkg-plist	2015-09-10 17:05:52.525083000 -0700
>@@ -14,7 +14,6 @@
> %%LIBDIR%%/libLinux.so
> %%LIBDIR%%/libSegment.so
> %%LIBDIR%%/libfbf.so
>-%%LIBDIR%%/libmlib_jai.so
> share/applications/lightzone.desktop
> share/icons/hicolor/128x128/apps/lightzone.png
> share/icons/hicolor/16x16/apps/lightzone.png

Actions: View | Diff

Attachments on bug 203034: 160918 | 160919