upgpkg: glee 5.4.0-4

3 files changed, 27 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 659ef3f68a72..e48dd36b3e23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
-# Generated by mksrcinfo v8
-# Tue Dec 26 20:57:51 UTC 2017
 pkgbase = glee
 	pkgdesc = Free cross-platform extension loading library for OpenGL
 	pkgver = 5.4.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://elf-stone.com/glee.php
 	arch = x86_64
 	license = custom:BSD
 	makedepends = mesa
 	depends = gcc-libs
 	depends = libgl
-	source = http://pkgs.fedoraproject.org/repo/pkgs/GLee/GLee-5.4.0-src.tar.gz/0bd03db136dbc075488b6c6e83f326ae/GLee-5.4.0-src.tar.gz
+	source = http://elf-stone.com/downloads/GLee/GLee-5.4.0-src.tar.gz
 	source = glee.pc
 	source = Makefile
-	md5sums = 0bd03db136dbc075488b6c6e83f326ae
-	md5sums = 937a48856486291070943488fa2824d0
-	md5sums = b59e8d11402fb2ee6c4a92bf6916b3aa
+	sha512sums = 4481ba742242e192af9ce3ab522a34764c04551e761c00186478a447badc271740b6a5c8503cbd72b6202355ef7a73beaac1f59f9681611b5c04a864922326fa
+	sha512sums = 84fd2e5923d808672c8220378e13e40d93a1f91a51a85a4fa44a8e571a7b0028eaa11ff69ba1c2e23323ed61247a33f9e3a2a3b0108d90ebf78274c39ef429c8
+	sha512sums = 98271cd1a4b034c664ba60a70828fc2fded66218e0839509fbd9d7d69c0e4bd8f01014f2fec87c8428006204a0e693b11d0b752181045dadd90e5de1cb13cf74
 
 pkgname = glee
 
diff --git a/Makefile b/Makefile
index 06425fd825d6..64fd3cd7f89e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,22 +5,21 @@ MINOR=4
 
 SOURCES = $(shell find . -name "*.c")
 
+CC?=$(CC)
+CXX?=$(CXX)
 SHARED_OBJS = $(SOURCES:.c=.shared.o)
 STATIC_OBJS = $(SOURCES:.c=.static.o)
 
-EXTRA_CFLAGS= $(CFLAGS)
-SHARED_CFLAGS= -Wall $(EXTRA_CFLAGS) -fPIC
+SHARED_CFLAGS+=-fPIC
 
-LDFLAGS= -Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined
-EXTRA_LDFLAGS=
+LDFLAGS?= -Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined
 LIBS=-lGL
-EXTRA_LIBS=
 
 libGLee.so.$(MAJOR).$(MINOR): $(SHARED_OBJS)
-	g++ $(LDFLAGS) $(EXTRA_LDFLAGS) -shared \
+	$(CXX) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared \
 		-Wl,-soname,libGLee.so.$(MAJOR) \
 		-o libGLee.so.$(MAJOR).$(MINOR) \
-		$+ -o $@ $(EXTRA_LIBS) $(LIBS)
+		$+ -o $@ $(LIBS)
 
 libGLee.so: libGLee.so.$(MAJOR).$(MINOR)
 	rm -f $@.$(MAJOR)
@@ -29,13 +28,13 @@ libGLee.so: libGLee.so.$(MAJOR).$(MINOR)
 	ln -s $@.$(MAJOR) $@
 
 %.shared.o: %.cpp
-	g++ -o $@ -c $+ $(SHARED_CFLAGS)
+	$(CXX) -o $@ -c $+ $(CFLAGS) $(CPPFLAGS) $(SHARED_CFLAGS)
 
 %.shared.o: %.c
-	gcc -o $@ -c $+ $(SHARED_CFLAGS)
+	$(CC) -o $@ -c $+ $(CFLAGS) $(CPPFLAGS) $(SHARED_CFLAGS)
 
 %.so : %.o
-	g++ $(LDFLAGS) $(EXTRA_LDFLAGS) -shared $^ -o $@
+	$(CXX) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared $^ -o $@
 
 clean:
 	rm -f $(SHARED_OBJS)
diff --git a/PKGBUILD b/PKGBUILD
index a3914d7923de..484d1ddbdf36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id$
-# Maintainer : speps <speps at aur dot archlinux dot org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: speps <speps at aur dot archlinux dot org>
 
 pkgname=glee
 pkgver=5.4.0
-pkgrel=3
-pkgdesc="Free cross-platform extension loading library for OpenGL"
+pkgrel=4
+pkgdesc='Free cross-platform extension loading library for OpenGL'
+url='http://elf-stone.com/glee.php'
 arch=('x86_64')
-url="http://elf-stone.com/glee.php"
 license=('custom:BSD')
 depends=('gcc-libs' 'libgl')
 makedepends=('mesa')
-#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
+source=(http://elf-stone.com/downloads/GLee/GLee-${pkgver}-src.tar.gz
+        glee.pc
+        Makefile)
+sha512sums=('4481ba742242e192af9ce3ab522a34764c04551e761c00186478a447badc271740b6a5c8503cbd72b6202355ef7a73beaac1f59f9681611b5c04a864922326fa'
+            '84fd2e5923d808672c8220378e13e40d93a1f91a51a85a4fa44a8e571a7b0028eaa11ff69ba1c2e23323ed61247a33f9e3a2a3b0108d90ebf78274c39ef429c8'
+            '98271cd1a4b034c664ba60a70828fc2fded66218e0839509fbd9d7d69c0e4bd8f01014f2fec87c8428006204a0e693b11d0b752181045dadd90e5de1cb13cf74')
 
 build() {
   make
 }
 
 package() {
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="${pkgdir}" install
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et: