diff --git a/media-libs/im/im-3.12.recipe b/media-libs/im/im-3.13.recipe similarity index 98% rename from media-libs/im/im-3.12.recipe rename to media-libs/im/im-3.13.recipe index ab99de8f0..94a048ab4 100644 --- a/media-libs/im/im-3.12.recipe +++ b/media-libs/im/im-3.13.recipe @@ -24,7 +24,7 @@ COPYRIGHT="1994-2016 Tecgraf, PUC-Rio." LICENSE="MIT" REVISION="1" 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" PATCHES="im-$portVersion.patchset" diff --git a/media-libs/im/patches/im-3.12.patchset b/media-libs/im/patches/im-3.13.patchset similarity index 70% rename from media-libs/im/patches/im-3.12.patchset rename to media-libs/im/patches/im-3.13.patchset index afef2e36c..17659f1dc 100644 --- a/media-libs/im/patches/im-3.12.patchset +++ b/media-libs/im/patches/im-3.13.patchset @@ -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 Date: Wed, 26 Dec 2018 14:18:48 +0100 Subject: Add soname for libraries on Haiku diff --git a/tecmake.mak b/tecmake.mak -index 25250b6..e57849c 100755 +index 524b7ec..7e43056 100755 --- a/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 @@ -24,7 +24,7 @@ index 25250b6..e57849c 100755 2.19.1 -From 88d962a815a20217445a2e0c3c043ecbef8b9835 Mon Sep 17 00:00:00 2001 +From 8fc44515cfe06206c3afb52f150be56428dcd291 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 26 Dec 2018 14:46:21 +0100 Subject: Avoid types conflicts in libjasper @@ -49,23 +49,23 @@ index 49daa8e..50ce27b 100755 2.19.1 -From c3f504fdbd25945d5696b179d6e9b6c9c60e9f94 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Wed, 26 Dec 2018 14:58:28 +0100 -Subject: Force Lua search path for Haiku +From 4b957c7ef9366ca29bfaccfecfe65f62f18e602b Mon Sep 17 00:00:00 2001 +From: begasus +Date: Wed, 13 Feb 2019 11:32:20 +0100 +Subject: Fix Lua search path for Haiku diff --git a/tecmake.mak b/tecmake.mak -index e57849c..98297f4 100755 +index 7e43056..f8cce1a 100755 --- a/tecmake.mak +++ b/tecmake.mak -@@ -1010,7 +1010,11 @@ ifdef USE_LUA +@@ -1048,7 +1048,11 @@ ifdef USE_LUA endif endif - LUA_INC ?= $(LUA)/include + 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 + LUA_INC ?= $(LUA)/include + endif