mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
freeimage, delete old bep/patch file, bump version with a working recipe (#1309)
This commit is contained in:
Schrijvers Luc
committed by
waddlesplash
waddlesplash
parent
ebd0f20e9a
commit
3d49125d8f
@@ -1,26 +0,0 @@
|
||||
DESCRIPTION="FreeImage is an Open Source library project for developers who would like to support popular graphics image formats like PNG, BMP, JPEG, TIFF and others as needed by today's multimedia applications"
|
||||
HOMEPAGE="http://freeimage.sourceforge.net"
|
||||
SOURCE_URI="http://downloads.sourceforge.net/freeimage/FreeImage3153.zip"
|
||||
REVISION="1"
|
||||
CHECKSUM_MD5="6c305b4086500ff8541c596ea6fc7cd7"
|
||||
STATUS_HAIKU="stable"
|
||||
MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
|
||||
DEPEND=""
|
||||
BUILD()
|
||||
{
|
||||
cd FreeImage
|
||||
make -f Makefile.gnu \
|
||||
INCDIR=`finddir B_COMMON_HEADERS_DIRECTORY` \
|
||||
INSTALLDIR=`finddir B_COMMON_LIB_DIRECTORY`
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd FreeImage
|
||||
make -f Makefile.gnu install \
|
||||
INCDIR=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY` \
|
||||
INSTALLDIR=${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY`
|
||||
}
|
||||
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="2003-2010 FreeImage Project"
|
||||
60
media-libs/freeimage/freeimage-3.17.0.recipe
Normal file
60
media-libs/freeimage/freeimage-3.17.0.recipe
Normal file
@@ -0,0 +1,60 @@
|
||||
SUMMARY="Open Source library project"
|
||||
DESCRIPTION="FreeImage is an Open Source library project for developers \
|
||||
who would like to support popular graphics image formats like PNG, BMP, \
|
||||
JPEG, TIFF and others as needed by today's multimedia applications"
|
||||
HOMEPAGE="http://freeimage.sourceforge.net"
|
||||
COPYRIGHT="2003-2010 FreeImage Project"
|
||||
LICENSE="GNU GPL v2
|
||||
GNU GPL v3"
|
||||
SOURCE_URI="http://downloads.sourceforge.net/freeimage/FreeImage3170.zip"
|
||||
REVISION="1"
|
||||
CHECKSUM_SHA256="fbfc65e39b3d4e2cb108c4ffa8c41fd02c07d4d436c594fff8dab1a6d5297f89"
|
||||
PATCHES="freeimage-$portVersion.patchset"
|
||||
SOURCE_DIR="FreeImage"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
freeimage$secondaryArchSuffix = $portVersion
|
||||
lib:libfreeimage$secondaryArchSuffix
|
||||
lib:libfreeimage_3.17.0$secondaryArchSuffix = $portVersion compat >= 3
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
freeimage${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libfreeimage$secondaryArchSuffix = $portVersion compat >= 3
|
||||
"
|
||||
REQUIRES_devel="
|
||||
freeimage$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:make
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
make -f Makefile.gnu \
|
||||
INCDIR=$includeDir \
|
||||
INSTALLDIR=$libDir
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make -f Makefile.gnu install \
|
||||
INCDIR=$includeDir \
|
||||
INSTALLDIR=$libDir
|
||||
|
||||
prepareInstalledDevelLib libfreeimage
|
||||
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
diff -Naur FreeImage/Makefile.gnu FreeImage-haiku/Makefile.gnu
|
||||
--- FreeImage/Makefile.gnu 2012-03-10 19:24:28.065011712 +0000
|
||||
+++ FreeImage-haiku/Makefile.gnu 2012-08-12 16:23:37.864550912 +0000
|
||||
@@ -62,9 +62,9 @@
|
||||
|
||||
install:
|
||||
install -d $(INCDIR) $(INSTALLDIR)
|
||||
- install -m 644 -o root -g root $(HEADER) $(INCDIR)
|
||||
- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
|
||||
- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
|
||||
+ install -m 644 $(HEADER) $(INCDIR)
|
||||
+ install -m 644 $(STATICLIB) $(INSTALLDIR)
|
||||
+ install -m 755 $(SHAREDLIB) $(INSTALLDIR)
|
||||
ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
|
||||
ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
|
||||
# ldconfig
|
||||
82
media-libs/freeimage/patches/freeimage-3.17.0.patchset
Normal file
82
media-libs/freeimage/patches/freeimage-3.17.0.patchset
Normal file
@@ -0,0 +1,82 @@
|
||||
From 1204da7c5540fbbaefa1a03917b04643a98b4a37 Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sat, 29 Apr 2017 09:43:40 +0200
|
||||
Subject: import patch from v3.15.3
|
||||
|
||||
|
||||
diff --git a/Makefile.gnu b/Makefile.gnu
|
||||
index 92f6358..9d136c6 100644
|
||||
--- a/Makefile.gnu
|
||||
+++ b/Makefile.gnu
|
||||
@@ -71,9 +71,9 @@ $(SHAREDLIB): $(MODULES)
|
||||
|
||||
install:
|
||||
install -d $(INCDIR) $(INSTALLDIR)
|
||||
- install -m 644 -o root -g root $(HEADER) $(INCDIR)
|
||||
- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
|
||||
- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
|
||||
+ install -m 644 $(HEADER) $(INCDIR)
|
||||
+ install -m 644 $(STATICLIB) $(INSTALLDIR)
|
||||
+ install -m 755 $(SHAREDLIB) $(INSTALLDIR)
|
||||
ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
|
||||
ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
|
||||
# ldconfig
|
||||
--
|
||||
2.7.0
|
||||
|
||||
|
||||
From f11e0f9976877c02fbb062fddf4b0e081693888c Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sat, 29 Apr 2017 09:49:37 +0200
|
||||
Subject: fix raw string literal
|
||||
|
||||
|
||||
diff --git a/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c
|
||||
index a7864a0..cb3adfe 100644
|
||||
--- a/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c
|
||||
+++ b/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c
|
||||
@@ -34,15 +34,15 @@
|
||||
G = G - t2 + kGCst; \
|
||||
B = B + kBCst; \
|
||||
__asm__ volatile ( \
|
||||
- "shll_s.w %["#R"], %["#R"], 9 \n\t" \
|
||||
- "shll_s.w %["#G"], %["#G"], 9 \n\t" \
|
||||
- "shll_s.w %["#B"], %["#B"], 9 \n\t" \
|
||||
- "precrqu_s.qb.ph %["#R"], %["#R"], $zero \n\t" \
|
||||
- "precrqu_s.qb.ph %["#G"], %["#G"], $zero \n\t" \
|
||||
- "precrqu_s.qb.ph %["#B"], %["#B"], $zero \n\t" \
|
||||
- "srl %["#R"], %["#R"], 24 \n\t" \
|
||||
- "srl %["#G"], %["#G"], 24 \n\t" \
|
||||
- "srl %["#B"], %["#B"], 24 \n\t" \
|
||||
+ "shll_s.w %[" #R "], %[" #R "], 9 \n\t" \
|
||||
+ "shll_s.w %[" #G "], %[" #G "], 9 \n\t" \
|
||||
+ "shll_s.w %[" #B "], %[" #B "], 9 \n\t" \
|
||||
+ "precrqu_s.qb.ph %[" #R "], %[" #R "], $zero \n\t" \
|
||||
+ "precrqu_s.qb.ph %[" #G "], %[" #G "], $zero \n\t" \
|
||||
+ "precrqu_s.qb.ph %[" #B "], %[" #B "], $zero \n\t" \
|
||||
+ "srl %[" #R "], %[" #R "], 24 \n\t" \
|
||||
+ "srl %[" #G "], %[" #G "], 24 \n\t" \
|
||||
+ "srl %[" #B "], %[" #B "], 24 \n\t" \
|
||||
: [R]"+r"(R), [G]"+r"(G), [B]"+r"(B) \
|
||||
: \
|
||||
); \
|
||||
diff --git a/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c
|
||||
index 66adde5..43990a0 100644
|
||||
--- a/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c
|
||||
+++ b/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c
|
||||
@@ -54,9 +54,9 @@
|
||||
"srl %[temp5], %[temp5], 24 \n\t" \
|
||||
"srl %[temp6], %[temp6], 24 \n\t" \
|
||||
"srl %[temp7], %[temp7], 24 \n\t" \
|
||||
- "sb %[temp5], "#R"(%[dst]) \n\t" \
|
||||
- "sb %[temp6], "#G"(%[dst]) \n\t" \
|
||||
- "sb %[temp7], "#B"(%[dst]) \n\t" \
|
||||
+ "sb %[temp5], " #R "(%[dst]) \n\t" \
|
||||
+ "sb %[temp6], " #G "(%[dst]) \n\t" \
|
||||
+ "sb %[temp7], " #B "(%[dst]) \n\t" \
|
||||
|
||||
#define ASM_CLOBBER_LIST() \
|
||||
: [temp0]"=&r"(temp0), [temp1]"=&r"(temp1), [temp2]"=&r"(temp2), \
|
||||
--
|
||||
2.7.0
|
||||
|
||||
Reference in New Issue
Block a user