Moved SFML in from the CCR, and removed unneeded dependencies.

This commit is contained in:
Adrián Chaves Fernández (Gallaecio) 2011-09-01 11:38:31 +00:00
parent ce584ee0f9
commit aeb13067aa
3 changed files with 137 additions and 0 deletions

4
sfml/ChangeLog Normal file
View File

@ -0,0 +1,4 @@
2011-03-16 Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
* 1.6-1 :
Imported from the CCR, and uploaded again because GTK is a dependency of it (so won't fit the official repositories).

63
sfml/PKGBUILD Normal file
View File

@ -0,0 +1,63 @@
# Maintainer: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
pkgname=sfml
_pkgname=SFML
pkgver=1.6
pkgrel=2
pkgdesc="A simple, fast, cross-platform and object-oriented multimedia API."
arch=('i686' 'x86_64')
url="http://www.sfml-dev.org"
license=('ZLIB')
depends=('freetype2' 'glew' 'libjpeg' 'libsndfile' 'libxrandr' 'openal' 'soil')
makedepends=(mesa doxygen)
changelog=ChangeLog
source=("http://downloads.sourceforge.net/$pkgname/$_pkgname-$pkgver-sdk-linux-64.tar.gz"
"use-system-libs.patch")
md5sums=('7a9b3a1ef6d14cd25090e440ccdbb3a8'
'505ea908fb6e4b9359061d8d55373963')
build() {
cd $srcdir/$_pkgname-$pkgver
# Apply patch to use system libs in favor of included ones (fixes many problems).
patch -Np1 < $srcdir/use-system-libs.patch
# Compilation.
make
# Fix the library softlinks for samples.
cd lib
for lib in *
do
ln -sf $lib ${lib/.${pkgver}/}
done
}
package() {
cd $srcdir/$_pkgname-$pkgver
# Prepare some directories.
mkdir -p $pkgdir/usr/lib \
$pkgdir/usr/include \
$pkgdir/usr/share/$pkgname \
$pkgdir/usr/share/doc
# Actual installation.
sed '/export DESTDIR/d' -i src/$_pkgname/Makefile
make DESTDIR=$pkgdir/usr install
# Fix the library softlinks (again).
cd $pkgdir/usr/lib
rm *.so
for lib in *
do
ln -s $lib ${lib/.$pkgver/}
done
cd $srcdir/$_pkgname-$pkgver
# Install docs.
cp -r doc $pkgdir/usr/share/doc/$pkgname
# License.
install -Dm 644 license.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
}

View File

@ -0,0 +1,70 @@
Only in SFML-1.6-old/lib: libsfml-graphics.so.1.6
Binary files SFML-1.6-old/lib/libsfml-network.so.1.6 and SFML-1.6/lib/libsfml-network.so.1.6 differ
Binary files SFML-1.6-old/lib/libsfml-system.so.1.6 and SFML-1.6/lib/libsfml-system.so.1.6 differ
Binary files SFML-1.6-old/lib/libsfml-window.so.1.6 and SFML-1.6/lib/libsfml-window.so.1.6 differ
diff -ur SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp SFML-1.6/src/SFML/Graphics/ImageLoader.cpp
--- SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp 2010-01-27 15:00:05.000000000 +0100
+++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp 2010-08-16 12:27:33.983627625 +0200
@@ -28,10 +28,10 @@
#include <SFML/Graphics/ImageLoader.hpp>
extern "C"
{
- #include <SFML/Graphics/libjpeg/jpeglib.h>
- #include <SFML/Graphics/libjpeg/jerror.h>
+ #include <jpeglib.h>
+ #include <jerror.h>
}
-#include <SFML/Graphics/libpng/png.h>
+#include <png.h>
#include <SFML/Graphics/SOIL/SOIL.h>
#include <iostream>
Only in SFML-1.6-old/src/SFML/Graphics: ImageLoader.cpp.rej
diff -ur SFML-1.6-old/src/SFML/Graphics/Makefile SFML-1.6/src/SFML/Graphics/Makefile
--- SFML-1.6-old/src/SFML/Graphics/Makefile 2010-01-27 15:00:05.000000000 +0100
+++ SFML-1.6/src/SFML/Graphics/Makefile 2010-08-16 12:25:13.663501212 +0200
@@ -1,15 +1,5 @@
SRC = $(wildcard *.cpp)
-SRCGLEW = $(wildcard ./GLEW/*.c)
-SRCJPEG = $(wildcard ./libjpeg/*.c)
-SRCPNG = $(wildcard ./libpng/*.c)
-SRCSOIL = $(wildcard ./SOIL/*.c)
-SRCZLIB = $(wildcard ./zlib/*.c)
OBJ = $(SRC:.cpp=.o)
-OBJGLEW = $(SRCGLEW:.c=.o)
-OBJJPEG = $(SRCJPEG:.c=.o)
-OBJPNG = $(SRCPNG:.c=.o)
-OBJSOIL = $(SRCSOIL:.c=.o)
-OBJZLIB = $(SRCZLIB:.c=.o)
ifeq ($(STATIC), yes)
LIB = libsfml-graphics-s.a
@@ -23,22 +13,19 @@
all: $(LIB)
-libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
+libsfml-graphics-s.a: $(OBJ)
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -static -lGLEW -ljpeg -lpng -lsoil -lz -lSOIL
-libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
+libsfml-graphics.so: $(OBJ)
+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lGLEW -ljpeg -lpng -lSOIL -lz -lfreetype -lX11 -lGL
$(OBJ): %.o: %.cpp
$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
-
.PHONY: clean mrproper
clean:
- @rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
+ @rm -rf $(OBJ)
mrproper: clean
@rm -rf $(LIBNAME)
Only in SFML-1.6-old/src/SFML/Graphics: Makefile.rej