haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

im, bump version, fix build for _x86 (#3633)

Browse Source
This commit is contained in:
Schrijvers Luc
2019-02-13 20:21:43 +01:00
committed by waddlesplash
parent 93b8bb28b7
commit 775f7780ed
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-libs/im/im-3.12.recipe → media-libs/im/im-3.13.recipe
View File

@@ -24,7 +24,7 @@ COPYRIGHT="1994-2016 Tecgraf, PUC-Rio."
LICENSE="MIT" LICENSE="MIT"
REVISION="1" REVISION="1"
SOURCE_URI="http://freefr.dl.sourceforge.net/project/imtoolkit/$portVersion/Docs%20and%20Sources/im-${portVersion}_Sources.tar.gz" SOURCE_URI="http://freefr.dl.sourceforge.net/project/imtoolkit/$portVersion/Docs%20and%20Sources/im-${portVersion}_Sources.tar.gz"
CHECKSUM_SHA256="999ff1a6aa305c4ed5a4ba830266a7aac8737def7f7d4010c398fd4ecddfac9f" CHECKSUM_SHA256="d303de96ea104f8d1bfc82e1bb4b061a6617a6f0082e37fe69950b7d2dcea3cd"
SOURCE_DIR="im" SOURCE_DIR="im"
PATCHES="im-$portVersion.patchset" PATCHES="im-$portVersion.patchset"

22
media-libs/im/patches/im-3.12.patchset → media-libs/im/patches/im-3.13.patchset
View File

@@ -1,14 +1,14 @@
From 6fc315d7bfc3b81ebed530f8a6e98e34eba98d8b Mon Sep 17 00:00:00 2001 From 159b056fff20def9a468febe7afe7b3866ca21ee Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk> From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 26 Dec 2018 14:18:48 +0100 Date: Wed, 26 Dec 2018 14:18:48 +0100
Subject: Add soname for libraries on Haiku Subject: Add soname for libraries on Haiku
diff --git a/tecmake.mak b/tecmake.mak diff --git a/tecmake.mak b/tecmake.mak
index 25250b6..e57849c 100755 index 524b7ec..7e43056 100755
--- a/tecmake.mak --- a/tecmake.mak
+++ b/tecmake.mak +++ b/tecmake.mak
@@ -634,6 +634,11 @@ ifneq ($(findstring CentOS, $(TEC_UNAME)), ) @@ -653,6 +653,11 @@ ifneq ($(findstring CentOS, $(TEC_UNAME)), )
endif endif
endif endif
@@ -24,7 +24,7 @@ index 25250b6..e57849c 100755
2.19.1 2.19.1
From 88d962a815a20217445a2e0c3c043ecbef8b9835 Mon Sep 17 00:00:00 2001 From 8fc44515cfe06206c3afb52f150be56428dcd291 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk> From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 26 Dec 2018 14:46:21 +0100 Date: Wed, 26 Dec 2018 14:46:21 +0100
Subject: Avoid types conflicts in libjasper Subject: Avoid types conflicts in libjasper
@@ -49,23 +49,23 @@ index 49daa8e..50ce27b 100755
2.19.1 2.19.1
From c3f504fdbd25945d5696b179d6e9b6c9c60e9f94 Mon Sep 17 00:00:00 2001 From 4b957c7ef9366ca29bfaccfecfe65f62f18e602b Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk> From: begasus <begasus@gmail.com>
Date: Wed, 26 Dec 2018 14:58:28 +0100 Date: Wed, 13 Feb 2019 11:32:20 +0100
Subject: Force Lua search path for Haiku Subject: Fix Lua search path for Haiku
diff --git a/tecmake.mak b/tecmake.mak diff --git a/tecmake.mak b/tecmake.mak
index e57849c..98297f4 100755 index 7e43056..f8cce1a 100755
--- a/tecmake.mak --- a/tecmake.mak
+++ b/tecmake.mak +++ b/tecmake.mak
@@ -1010,7 +1010,11 @@ ifdef USE_LUA @@ -1048,7 +1048,11 @@ ifdef USE_LUA
endif endif
endif endif
- LUA_INC ?= $(LUA)/include - LUA_INC ?= $(LUA)/include
+ ifneq ($(findstring Haiku, $(TEC_UNAME)), ) + ifneq ($(findstring Haiku, $(TEC_UNAME)), )
+ LUA_INC ?= /system/develop/headers/lua5.1 + LUA_INC ?= $(shell pkg-config --cflags-only-I lua | cut -b 3-)
+ else + else
+ LUA_INC ?= $(LUA)/include + LUA_INC ?= $(LUA)/include
+ endif + endif