add missing patch

3 files changed, 73 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec34ac7665c1..abb947af5cef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,22 @@
 pkgbase = mingw-w64-freeglut
 	pkgdesc = Provides functionality for small OpenGL programs (mingw-w64)
 	pkgver = 3.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://freeglut.sourceforge.net/
 	arch = any
 	license = MIT
 	makedepends = mingw-w64-cmake
 	depends = mingw-w64-crt
+	noextract = freeglut-3.0.0.tar.gz
 	options = !strip
 	options = !buildflags
 	options = staticlibs
 	source = http://downloads.sourceforge.net/freeglut/freeglut-3.0.0.tar.gz
+	source = 0001-Emit-the-correct-LIBNAME-to-.pc-files.patch
 	md5sums = 90c3ca4dd9d51cf32276bc5344ec9754
+	md5sums = 60f8ec454e4fcd6e9fe1b5f2109d9903
 	sha1sums = fca52242f9344627a30f11487ee42002e6b0dacd
+	sha1sums = 8742daa8325f9e518a664f3d1e458dee605739e7
 
 pkgname = mingw-w64-freeglut
 
diff --git a/0001-Emit-the-correct-LIBNAME-to-.pc-files.patch b/0001-Emit-the-correct-LIBNAME-to-.pc-files.patch
new file mode 100644
index 000000000000..2d09e8b1f2ad
--- /dev/null
+++ b/0001-Emit-the-correct-LIBNAME-to-.pc-files.patch
@@ -0,0 +1,47 @@
+From d06589f55c87370d388dec333f4bff35c29762f3 Mon Sep 17 00:00:00 2001
+From: Ray Donnelly <mingw.android@gmail.com>
+Date: Fri, 8 Jan 2016 16:46:01 +0000
+Subject: [PATCH] Emit the correct LIBNAME to .pc files
+
+Irrespective of "FREEGLUT_REPLACE_GLUT" being set to "No" or being on
+Win32 where this variable does not even exist, the .pc file contained
+Libs: -L${libdir} -lglut
+
+Instead, emit the correct value.
+---
+ freeglut/freeglut/CMakeLists.txt | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/freeglut/freeglut/CMakeLists.txt b/freeglut/freeglut/CMakeLists.txt
+index 71f4ef5..7fae09a 100644
+--- a/freeglut/freeglut/CMakeLists.txt
++++ b/freeglut/freeglut/CMakeLists.txt
+@@ -389,6 +389,7 @@ IF(FREEGLUT_BUILD_STATIC_LIBS)
+ ENDIF()
+ 
+ 
++SET(LIBNAME freeglut)
+ IF(WIN32)
+     LIST(APPEND LIBS winmm)
+     IF(FREEGLUT_BUILD_SHARED_LIBS)
+@@ -424,8 +425,6 @@ ELSE()
+     ELSE()
+ 		IF(FREEGLUT_REPLACE_GLUT)
+ 			SET(LIBNAME glut)
+-		ELSE()
+-			SET(LIBNAME freeglut)
+ 		ENDIF()
+ 	ENDIF()
+ 
+@@ -563,7 +562,7 @@ ELSE()
+ ENDIF()
+ # Client applications need to define FreeGLUT GLES version to
+ # bootstrap headers inclusion in freeglut_std.h:
+-SET(PC_LIBNAME "glut")
++SET(PC_LIBNAME ${LIBNAME})
+ SET(PC_FILENAME "freeglut.pc")
+ IF(FREEGLUT_GLES)
+   SET(PC_CFLAGS "-DFREEGLUT_GLES")
+-- 
+2.6.3
+
diff --git a/PKGBUILD b/PKGBUILD
index c29027acb26a..83e250c83a41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,34 @@
+# Maintainer: Andrew Sun <adsun701@gmail.com>
+
 pkgname=mingw-w64-freeglut
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides functionality for small OpenGL programs (mingw-w64)"
 arch=(any)
 url="http://freeglut.sourceforge.net/"
 license=("MIT")
-depends=(mingw-w64-crt)
-makedepends=(mingw-w64-cmake)
+depends=('mingw-w64-crt')
+makedepends=('mingw-w64-cmake')
 options=(!strip !buildflags staticlibs)
-source=("http://downloads.sourceforge.net/freeglut/freeglut-${pkgver}.tar.gz")
-md5sums=('90c3ca4dd9d51cf32276bc5344ec9754')
-sha1sums=('fca52242f9344627a30f11487ee42002e6b0dacd')
+source=("http://downloads.sourceforge.net/freeglut/freeglut-${pkgver}.tar.gz"
+        "0001-Emit-the-correct-LIBNAME-to-.pc-files.patch")
+md5sums=('90c3ca4dd9d51cf32276bc5344ec9754'
+         '60f8ec454e4fcd6e9fe1b5f2109d9903')
+sha1sums=('fca52242f9344627a30f11487ee42002e6b0dacd'
+          '8742daa8325f9e518a664f3d1e458dee605739e7')
+noextract=("freeglut-${pkgver}.tar.gz")
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
+prepare() {
+  # Clean up old sources so re-patching doesn't fail.
+  [[ -d ${srcdir}/freeglut-${pkgver} ]] && rm -rf ${srcdir}/freeglut-${pkgver}
+  tar -xzvf ${srcdir}/freeglut-${pkgver}.tar.gz -C ${srcdir}
+  # Upstreaming at https://github.com/dcnieho/FreeGLUT/pull/41
+  cd ${srcdir}/freeglut-${pkgver}
+  patch -p3 -i "${srcdir}"/0001-Emit-the-correct-LIBNAME-to-.pc-files.patch
+}
+
 build() {
   cd "${srcdir}/freeglut-${pkgver}"
   for _arch in ${_architectures}; do