mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
Schrijvers Luc
GitHub
@@ -3,12 +3,12 @@ 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"
|
||||
COPYRIGHT="2003-2018 FreeImage Project"
|
||||
LICENSE="GNU GPL v2
|
||||
GNU GPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="http://downloads.sourceforge.net/freeimage/FreeImage3170.zip"
|
||||
CHECKSUM_SHA256="fbfc65e39b3d4e2cb108c4ffa8c41fd02c07d4d436c594fff8dab1a6d5297f89"
|
||||
SOURCE_URI="https://downloads.sourceforge.net/freeimage/FreeImage${portVersion//.}.zip"
|
||||
CHECKSUM_SHA256="f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd"
|
||||
SOURCE_DIR="FreeImage"
|
||||
PATCHES="freeimage-$portVersion.patchset"
|
||||
|
||||
@@ -17,8 +17,8 @@ SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
freeimage$secondaryArchSuffix = $portVersion
|
||||
lib:libfreeimage$secondaryArchSuffix
|
||||
lib:libfreeimage_3.17.0$secondaryArchSuffix = $portVersion compat >= 3
|
||||
lib:libfreeimage$secondaryArchSuffix = 3
|
||||
lib:libfreeimage_3.18.0$secondaryArchSuffix
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -26,7 +26,8 @@ REQUIRES="
|
||||
|
||||
PROVIDES_devel="
|
||||
freeimage${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libfreeimage$secondaryArchSuffix = $portVersion compat >= 3
|
||||
devel:libfreeimage$secondaryArchSuffix = 3
|
||||
devel:libfreeimage_3.18.0$secondaryArchSuffix
|
||||
"
|
||||
REQUIRES_devel="
|
||||
freeimage$secondaryArchSuffix == $portVersion base
|
||||
@@ -53,7 +54,21 @@ INSTALL()
|
||||
INCDIR=$includeDir \
|
||||
INSTALLDIR=$libDir
|
||||
|
||||
prepareInstalledDevelLib libfreeimage
|
||||
prepareInstalledDevelLibs libfreeimage libfreeimage-3.18.0
|
||||
|
||||
mkdir -p "$developLibDir"/pkgconfig
|
||||
cat > "$developLibDir"/pkgconfig/freeimage.pc << EOF
|
||||
prefix=${prefix}
|
||||
exec_prefix=${prefix}
|
||||
libdir=${libDir}
|
||||
includedir=${includeDir}
|
||||
|
||||
Name: freeimage
|
||||
Description: FreeImage
|
||||
Version: ${portVersion}
|
||||
Libs: -L${developLibDir} -lfreeimage
|
||||
Cflags: -I${includeDir}
|
||||
EOF
|
||||
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
@@ -1,82 +0,0 @@
|
||||
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
|
||||
|
||||
26
media-libs/freeimage/patches/freeimage-3.18.0.patchset
Normal file
26
media-libs/freeimage/patches/freeimage-3.18.0.patchset
Normal file
@@ -0,0 +1,26 @@
|
||||
From 00cdab4825d526b9a75a530b9a71bc999b3b51a8 Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Wed, 26 Dec 2018 13:44:27 +0100
|
||||
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.19.1
|
||||
|
||||
Reference in New Issue
Block a user