Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-18 22:06:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

graphics/enblend-enfuse: Updated for version 4.1.1.

Browse source 
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
This commit is contained in:
titopoquito 2013-04-25 18:54:49 -03:00 committed by Niels Horn
parent d6ab6040e9
commit 68c3666b9e
3 changed files with 9 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
graphics/enblend-enfuse/enblend-enfuse.SlackBuild
View file

@ -3,7 +3,7 @@
# Slackware build script for Enblend-Enfuse
#
# Copyright 2009-2010 Erik W. Hanson, Minneapolis, MN, USA
# Copyright 2011 titopoquito (titopoquito@googlemail.com)
# Copyright 2011-2013 titopoquito (titopoquito@googlemail.com)
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=enblend-enfuse
VERSION=4.0
VERSION=4.1.1
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -60,31 +60,18 @@ set -eu
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf $PRGNAM-$VERSION-*
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION-*
cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
patch -p1 < $CWD/libpng14-fix.diff
# Patch a possible bug that only occurs if
# the user has installed libjpeg-turbo.
# Upstream has already fixed this, but this
# bug is still present in the 4.0 tarball.
# See: http://old.nabble.com/Error-interpreting-JPEG-file-td31789059.html
# and https://bugs.launchpad.net/hugin/+bug/894287
# Since slackbuilds.org has a SlackBuild for
# libjpeg-turbo this looks like the safer way.
sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx
CXXFLAGS="$SLKCFLAGS" \
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--mandir=/usr/man \
--infodir=/usr/info \
--disable-static \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--build=$ARCH-slackware-linux
@ -96,7 +83,7 @@ gzip -9 $PKG/usr/info/*.info
rm -rf $PKG/usr/info/dir
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING ChangeLog NEWS README README.txt VERSION VIGRA_LICENSE \
cp -a AUTHORS COPYING ChangeLog NEWS README README.txt VERSION \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild

8
graphics/enblend-enfuse/enblend-enfuse.info
View file

@ -1,10 +1,10 @@
PRGNAM="enblend-enfuse"
VERSION="4.0"
VERSION="4.1.1"
HOMEPAGE="http://enblend.sourceforge.net/"
DOWNLOAD="http://downloads.sourceforge.net/enblend/enblend-enfuse-4.0.tar.gz"
MD5SUM="2e7c950061e0085fd75d94576130250f"
DOWNLOAD="http://downloads.sourceforge.net/enblend/enblend-enfuse-4.1.1.tar.gz"
MD5SUM="9bc34f423f3bee35150ab593211da4a2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libxmi"
REQUIRES="libxmi gsl vigra"
MAINTAINER="titopoquito"
EMAIL="titopoquito@googlemail.com"

40
graphics/enblend-enfuse/libpng14-fix.diff
View file

@ -1,40 +0,0 @@
diff -r e29281594440 -r 9d9b5f3a97cd src/vigra_impex/png.cxx
--- a/src/vigra_impex/png.cxx Mon Nov 09 11:10:35 2009 +0100
+++ b/src/vigra_impex/png.cxx Mon Apr 12 14:52:44 2010 +0200
@@ -65,10 +65,20 @@
#include <png.h>
}
+#define STRINGIFY(m_argument) #m_argument
+
#if PNG_LIBPNG_VER < 10201
#error "please update your libpng to at least 1.2.1"
#endif
+#if PNG_LIBPNG_VER >= 10400
+#define PNG_SET_EXPAND_GRAY_1_2_4_TO_8_NAME png_set_expand_gray_1_2_4_to_8
+#else
+#define PNG_SET_EXPAND_GRAY_1_2_4_TO_8_NAME png_set_gray_1_2_4_to_8
+#endif
+#define PNG_SET_EXPAND_GRAY_1_2_4_TO_8_FUNCTION_NAME STRINGIFY(PNG_SET_EXPAND_GRAY_1_2_4_TO_8_NAME)
+#define PNG_SET_EXPAND_GRAY_1_2_4_TO_8(m_image) PNG_SET_EXPAND_GRAY_1_2_4_TO_8_NAME(m_image)
+
// TODO: per-scanline reading/writing
namespace {
@@ -274,8 +284,8 @@
// expand gray values to at least one byte size
if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
if (setjmp(png->jmpbuf))
- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
- png_set_gray_1_2_4_to_8(png);
+ vigra_postcondition( false, png_error_message.insert(0, "error in " PNG_SET_EXPAND_GRAY_1_2_4_TO_8_FUNCTION_NAME " (): ").c_str());
+ PNG_SET_EXPAND_GRAY_1_2_4_TO_8(png);
bit_depth = 8;
}