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

sge: fix secondary arch build.

Browse Source
This commit is contained in:
Adrien Destugues
2017-02-11 16:24:52 +01:00
parent 037b168d45
commit 7b7c210e28
2 changed files with 68 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
media-libs/sge/patches/sge-030809.patch → media-libs/sge/patches/sge-030809.patchset
View File

@@ -1,7 +1,14 @@
diff -urN sge030809/Makefile sge030809-haiku/Makefile
--- sge030809/Makefile 2003-08-11 22:40:41.015728640 +0000
+++ sge030809-haiku/Makefile 2010-05-31 17:12:42.000000000 +0000
@@ -71,13 +71,13 @@
From 75eae264c5b74e1dbd6398a0c5f7d249de2632aa Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 11 Feb 2017 16:24:20 +0100
Subject: applying patch sge-030809.patch
diff --git a/Makefile b/Makefile
index a35cfa0..88b69c0 100644
--- a/Makefile
+++ b/Makefile
@@ -71,13 +71,13 @@ endif
endif
install: shared
@@ -23,10 +30,22 @@ diff -urN sge030809/Makefile sge030809-haiku/Makefile
- @echo "** Library files installed in $(PREFIX)/lib"
+ @echo "** Headerfiles installed in $(DESTDIR)$(PREFIX_H)"
+ @echo "** Library files installed in $(DESTDIR)$(PREFIX)/lib"
diff -urN sge030809/Makefile.conf sge030809-haiku/Makefile.conf
--- sge030809/Makefile.conf 2003-08-11 22:43:35.015728640 +0000
+++ sge030809-haiku/Makefile.conf 2010-05-31 17:14:25.189792256 +0000
@@ -25,14 +25,14 @@
diff --git a/Makefile.conf b/Makefile.conf
index 50dcea3..18f9244 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -3,8 +3,8 @@
# Comment/uncomment the following line to disable/enable build options
# (See README for more info)
C_COMP = y
-#USE_FT = n
-#USE_IMG = n
+USE_FT = y
+USE_IMG = y
#QUIET = y
@@ -25,14 +25,14 @@ PREFIX =$(shell sdl-config --prefix)
PREFIX_H =$(shell sdl-config --prefix)/include/SDL
# Flags passed to the compiler
@@ -43,9 +62,10 @@ diff -urN sge030809/Makefile.conf sge030809-haiku/Makefile.conf
# Is freetype-config available?
diff -urN sge030809/sge_tt_text.cpp sge030809-haiku/sge_tt_text.cpp
--- sge030809/sge_tt_text.cpp 2003-08-08 12:48:08.016252928 +0000
+++ sge030809-haiku/sge_tt_text.cpp 2010-05-31 17:12:42.000000000 +0000
diff --git a/sge_tt_text.cpp b/sge_tt_text.cpp
index c7d4b2c..befde47 100644
--- a/sge_tt_text.cpp
+++ b/sge_tt_text.cpp
@@ -36,10 +36,9 @@
#include "sge_textpp.h"
@@ -60,7 +80,7 @@ diff -urN sge030809/sge_tt_text.cpp sge030809-haiku/sge_tt_text.cpp
/* The structure used to hold glyph information (cached) */
struct glyph {
@@ -294,7 +293,7 @@
@@ -294,7 +293,7 @@ sge_TTFont *sge_TTF_OpenFontIndexRW(SDL_RWops *src, int freesrc, int ptsize, lon
}
memset(stream, 0, sizeof(*stream));
@@ -69,16 +89,37 @@ diff -urN sge030809/sge_tt_text.cpp sge030809-haiku/sge_tt_text.cpp
stream->read = RWread;
stream->descriptor.pointer = src;
stream->pos = (unsigned long)position;
--- sge030809/Makefile.conf 2013-10-27 04:16:27.931659776 -0700
+++ sge030809-haiku/Makefile.conf 2013-10-27 04:45:27.596639744 -0700
@@ -3,8 +3,8 @@
# Comment/uncomment the following line to disable/enable build options
# (See README for more info)
C_COMP = y
-#USE_FT = n
-#USE_IMG = n
+USE_FT = y
+USE_IMG = y
#QUIET = y
--
2.7.0
From 2b0006d74bfe04167e0fa3960c59a07e92d6b8c4 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 11 Feb 2017 16:28:57 +0100
Subject: Fix install dir for secondary architecture.
diff --git a/Makefile b/Makefile
index 88b69c0..7708d26 100644
--- a/Makefile
+++ b/Makefile
@@ -73,11 +73,11 @@ endif
install: shared
@mkdir -p $(DESTDIR)$(PREFIX_H)
install -c -m 644 sge*.h $(DESTDIR)$(PREFIX_H)
- @mkdir -p $(DESTDIR)$(PREFIX)/lib
- install -c -m 644 libSGE.a $(DESTDIR)$(PREFIX)/lib
- install -c libSGE.so $(DESTDIR)$(PREFIX)/lib/libSGE.so.$(API_VER).$(SGE_VER)
- @cd $(DESTDIR)$(PREFIX)/lib;\
+ @mkdir -p $(DESTDIR)$(LIBDIR)
+ install -c -m 644 libSGE.a $(DESTDIR)$(LIBDIR)
+ install -c libSGE.so $(DESTDIR)$(LIBDIR)/libSGE.so.$(API_VER).$(SGE_VER)
+ @cd $(DESTDIR)$(LIBDIR);\
ln -sf libSGE.so.$(API_VER).$(SGE_VER) libSGE.so.$(API_VER);\
ln -sf libSGE.so.$(API_VER) libSGE.so
@echo "** Headerfiles installed in $(DESTDIR)$(PREFIX_H)"
- @echo "** Library files installed in $(DESTDIR)$(PREFIX)/lib"
+ @echo "** Library files installed in $(DESTDIR)$(LIBDIR)"
--
2.7.0

4
media-libs/sge/sge-030809.recipe
View File

@@ -5,11 +5,11 @@ surfaces, pixel operations and much more."
HOMEPAGE="http://www.etek.chalmers.se/~e8cal1/sge/"
COPYRIGHT="1999-2003 Anders Lindstrom"
LICENSE="GNU LGPL v2.1"
REVISION="2"
REVISION="3"
SOURCE_URI="http://ports-space.haiku-files.org/source/sge-030809.tar.gz"
CHECKSUM_SHA256="25cfbe59ab99647254e69d25984707045492c2a5d1b15f27d999d0284a7110fc"
SOURCE_DIR="sge030809"
PATCHES="sge-030809.patch"
PATCHES="sge-030809.patchset"
ARCHITECTURES="x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"