Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/glee/PKGBUILD
	extra/brasero/PKGBUILD
	extra/cups/PKGBUILD
	extra/gdk-pixbuf2/PKGBUILD
	extra/geoclue/PKGBUILD
	extra/lilv/PKGBUILD
	extra/php/PKGBUILD
	extra/sord/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/sratom/PKGBUILD
	extra/suil/PKGBUILD
	libre/clementine-libre/PKGBUILD

3 files changed, 81 insertions, 21 deletions

diff --git a/community/glee/Makefile b/community/glee/Makefile
new file mode 100644
index 000000000..06425fd82
--- /dev/null
+++ b/community/glee/Makefile
@@ -0,0 +1,55 @@
+all: libGLee.so
+
+MAJOR=5
+MINOR=4
+
+SOURCES = $(shell find . -name "*.c")
+
+SHARED_OBJS = $(SOURCES:.c=.shared.o)
+STATIC_OBJS = $(SOURCES:.c=.static.o)
+
+EXTRA_CFLAGS= $(CFLAGS)
+SHARED_CFLAGS= -Wall $(EXTRA_CFLAGS) -fPIC
+
+LDFLAGS= -Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined
+EXTRA_LDFLAGS=
+LIBS=-lGL
+EXTRA_LIBS=
+
+libGLee.so.$(MAJOR).$(MINOR): $(SHARED_OBJS)
+	g++ $(LDFLAGS) $(EXTRA_LDFLAGS) -shared \
+		-Wl,-soname,libGLee.so.$(MAJOR) \
+		-o libGLee.so.$(MAJOR).$(MINOR) \
+		$+ -o $@ $(EXTRA_LIBS) $(LIBS)
+
+libGLee.so: libGLee.so.$(MAJOR).$(MINOR)
+	rm -f $@.$(MAJOR)
+	ln -s $@.$(MAJOR).$(MINOR) $@.$(MAJOR)
+	rm -f $@
+	ln -s $@.$(MAJOR) $@
+
+%.shared.o: %.cpp
+	g++ -o $@ -c $+ $(SHARED_CFLAGS)
+
+%.shared.o: %.c
+	gcc -o $@ -c $+ $(SHARED_CFLAGS)
+
+%.so : %.o
+	g++ $(LDFLAGS) $(EXTRA_LDFLAGS) -shared $^ -o $@
+
+clean:
+	rm -f $(SHARED_OBJS)
+	rm -f $(FIXED_OBJS)
+	rm -f *.so *.so* *~
+
+DESTDIR=
+
+install: libGLee.so
+	install -d "$(DESTDIR)/usr/lib/"
+	cp -a *.so* "$(DESTDIR)/usr/lib/"
+	install -d "$(DESTDIR)/usr/include/"
+	install -Dm644 *.h "$(DESTDIR)/usr/include/"
+	install -d "$(DESTDIR)/usr/lib/pkgconfig/"
+	install -Dm644 glee.pc "$(DESTDIR)/usr/lib/pkgconfig/"
+	install -d  "$(DESTDIR)/usr/share/licenses/glee"
+	sed '9,32!d' readme.txt > "$(DESTDIR)/usr/share/licenses/glee/LICENSE"
diff --git a/community/glee/PKGBUILD b/community/glee/PKGBUILD
index 928cb04b8..3ad4e3649 100644
--- a/community/glee/PKGBUILD
+++ b/community/glee/PKGBUILD
@@ -1,38 +1,31 @@
-# $Id: PKGBUILD 72465 2012-06-14 23:53:43Z ebelanger $
-# Maintainer : SpepS <dreamspepser at yahoo dot it>
-# Contributor: Philipp Brüschweiler <blei42 at gmail dot com >
+# $Id: PKGBUILD 86549 2013-03-19 04:49:29Z speps $
+# Maintainer : speps <speps at aur dot archlinux dot org>
 
 pkgname=glee
-pkgver=5.4
-pkgrel=4
-pkgdesc="Free cross-platform extension loading library for OpenGL."
+pkgver=5.4.0
+pkgrel=1
+pkgdesc="Free cross-platform extension loading library for OpenGL"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://elf-stone.com/glee.php"
-license=('BSD')
+license=('custom:BSD')
 depends=('gcc-libs' 'libgl')
 makedepends=('mesa')
-source=("http://elf-stone.com/downloads/GLee/GLee-5.4.0-src.tar.gz")
-md5sums=('0bd03db136dbc075488b6c6e83f326ae')
+#source=("http://elf-stone.com/downloads/GLee/GLee-$pkgver-src.tar.gz")
+md5sums=('0bd03db136dbc075488b6c6e83f326ae'
+         '937a48856486291070943488fa2824d0'
+         'b59e8d11402fb2ee6c4a92bf6916b3aa')
+_spkg=GLee-$pkgver-src.tar.gz
+source=("http://pkgs.fedoraproject.org/repo/pkgs/GLee/$_spkg/$md5sums/$_spkg"
+        glee.pc Makefile) # implement FS#32670 + fix TEXTREL for i686
 
 build() {
   cd "$srcdir"
-
-  [ "$CARCH" != 'i686' ] && export CXXFLAGS="$CXXFLAGS -fPIC"
-
-  ./configure --prefix=/usr
   make
 }
 
 package() {
   cd "$srcdir"
-
-  # lib and headers
-  install -Dm755 libGLee.so "$pkgdir/usr/lib/libGLee.so"
-  install -Dm644 GLee.h "$pkgdir/usr/include/GLee.h"
-
-  # license
-  install -Dm644 readme.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  sed -i '9,32!d' "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  make DESTDIR="$pkgdir/" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/glee/glee.pc b/community/glee/glee.pc
new file mode 100644
index 000000000..0f03b450a
--- /dev/null
+++ b/community/glee/glee.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: GLee
+Description: GL Easy Extension library
+Version: 5.4.0
+Requires: 
+Conflicts: 
+Libs: -L${libdir} -lglee
+Cflags: -I${includedir}