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

Updated glpng .bep and .patch files, they now build the zip file, but there's a stray include directory also created that needs to be fixed

Browse Source 
still.
This commit is contained in:
Scott McCreary
2010-09-26 20:14:25 +00:00
parent 330d167d06
commit d00863a3ce
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media-libs/glpng/glpng-1.4.5.bep
View File

@@ -7,17 +7,11 @@ STATUS_HAIKU="stable"
DEPEND="" DEPEND=""
BUILD { BUILD {
COMMONGLLIB='/boot/develop/headers/os/opengl/GL/'
mkdir -p COMMONGLLIB
cp include/GL/glpng.h ${COMMONGLLIB}glpng.h
echo cp include/GL/glpng.h ${COMMONGLLIB}/glpng.h
cd src cd src
make -f Makefile.HAIKU make -f Makefile.HAIKU
} }
INSTALL { INSTALL {
mkdir -p ${DESTDIR}${COMMONGLLIB}
cp include/GL/glpng.h ${DESTDIR}${COMMONGLLIB}/glpng.h
cd src cd src
make install -f Makefile.HAIKU make install -f Makefile.HAIKU
} }

18
media-libs/glpng/patches/glpng-1.4.5.patch
View File

@@ -1,11 +1,11 @@
diff -Naurb src/Makefile.HAIKU glpng-1.4.5-haiku/src/Makefile.HAIKU diff -Naurb src/Makefile.HAIKU glpng-1.4.5-haiku/src/Makefile.HAIKU
--- src/Makefile.HAIKU 1970-01-01 00:00:00.000000000 +0000 --- src/Makefile.HAIKU 1970-01-01 00:00:00.000000000 +0000
+++ src/Makefile.HAIKU 2010-07-05 02:35:34.000000000 +0000 +++ src/Makefile.HAIKU 2010-07-05 02:35:34.000000000 +0000
@@ -0,0 +1,28 @@ @@ -0,0 +1,30 @@
+LDFLAGS=-lpng -lGL +LDFLAGS=-lpng -lGL
+SHAREDLIBFLAGS=-shared -fPIC +SHAREDLIBFLAGS=-shared -fPIC
+DESTDIR=/boot/common +LIBDIR:=$(shell finddir B_COMMON_LIB_DIRECTORY)
+LIB=lib +GLINCLUDEDIR:=$(shell finddir B_COMMON_DEVELOP_DIRECTORY)/headers/os/opengl/GL
+INCPATH = -I../include +INCPATH = -I../include
+ +
+all: libglpng.a libglpng.so.1.45 +all: libglpng.a libglpng.so.1.45
@@ -23,13 +23,15 @@ diff -Naurb src/Makefile.HAIKU glpng-1.4.5-haiku/src/Makefile.HAIKU
+ rm glpng.o libglpng.* + rm glpng.o libglpng.*
+ +
+install: +install:
+ for i in include ../include/GL $(LIB); do \ + for i in include ../include/GL $(LIBDIR); do \
+ install -m 755 -d $(DESTDIR)/$$i; \ + install -m 755 -d $(DESTDIR)/$$i; \
+ done + done
+ install -p -m 644 ../include/GL/glpng.h $(DESTDIR)/include/GL + mkdir -p $(DESTDIR)$(GLINCLUDEDIR)
+ install -m 755 libglpng.* $(DESTDIR)/$(LIB) + mkdir -p $(DESTDIR)$(LIBDIR)
+ ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so.1 + install -p -m 644 ../include/GL/glpng.h $(DESTDIR)$(GLINCLUDEDIR)
+ ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so + install -m 755 libglpng.* $(DESTDIR)$(LIBDIR)
+ ln -s -f libglpng.so.1.45 $(DESTDIR)$(LIBDIR)/libglpng.so.1
+ ln -s -f libglpng.so.1.45 $(DESTDIR)$(LIBDIR)/libglpng.so
diff -Naurb src/glpng.c glpng-1.4.5-haiku/src/glpng.c diff -Naurb src/glpng.c glpng-1.4.5-haiku/src/glpng.c
--- src/glpng.c 2000-07-10 21:27:10.026738688 +0000 --- src/glpng.c 2000-07-10 21:27:10.026738688 +0000
+++ src/glpng.c 2010-07-05 02:47:05.069992448 +0000 +++ src/glpng.c 2010-07-05 02:47:05.069992448 +0000