Navigation Menu

Skip to content

Instantly share code, notes, and snippets.

@lubosz
Created February 16, 2017 21:00
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save lubosz/df6ed2fb1c4a08aa85ed28ff72d835af to your computer and use it in GitHub Desktop.
Save lubosz/df6ed2fb1c4a08aa85ed28ff72d835af to your computer and use it in GitHub Desktop.
patch including patch and PKGBUILD updates
From 870a4e02887bd032537076de88591b70cdffc94f Mon Sep 17 00:00:00 2001
From: Lubosz Sarnecki <lubosz.sarnecki@collabora.co.uk>
Date: Thu, 16 Feb 2017 21:58:33 +0100
Subject: [PATCH] workaround glfw3 cmake build issue.
---
0001-hack-to-fix-build-on-Arch.patch | 23 +++++++++++++++++++++++
PKGBUILD | 11 ++++++++---
2 files changed, 31 insertions(+), 3 deletions(-)
create mode 100644 0001-hack-to-fix-build-on-Arch.patch
diff --git a/0001-hack-to-fix-build-on-Arch.patch b/0001-hack-to-fix-build-on-Arch.patch
new file mode 100644
index 0000000..44c6ad3
--- /dev/null
+++ b/0001-hack-to-fix-build-on-Arch.patch
@@ -0,0 +1,23 @@
+From 9a601bb958bf5c5a810bede9fdcf6aa1436a35b0 Mon Sep 17 00:00:00 2001
+From: Lubosz Sarnecki <lubosz.sarnecki@collabora.co.uk>
+Date: Thu, 16 Feb 2017 21:54:57 +0100
+Subject: [PATCH] hack to fix build on Arch.
+
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7030dd5..4a1154d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,4 +2,6 @@ cmake_minimum_required (VERSION 2.8.11)
+
+ project (ktxutils)
+
++set(GLFW3_LIBRARY glfw)
++
+ add_subdirectory (src)
+--
+2.11.1
+
diff --git a/PKGBUILD b/PKGBUILD
index c88528d..98a4a12 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Kirchner <daniel at ekpyron dot org>
pkgname=ktxutils-git
_pkgbase=ktxutils
-pkgver=r14.78391f6
+pkgver=r18.cb431ba
pkgrel=1
pkgdesc="Utilities for the KTX texture format"
license=('MIT')
@@ -9,8 +9,13 @@ arch=('any')
url="http://github.com/ekpyron/${_pkgbase}/"
depends=('glfw' 'imagemagick' 'glew')
makedepends=('cmake')
-source=("git+git://github.com/ekpyron/${_pkgbase}")
-md5sums=('SKIP')
+source=("git+git://github.com/ekpyron/${_pkgbase}" 0001-hack-to-fix-build-on-Arch.patch)
+md5sums=('SKIP' '7d4d3bd2bdf79b2ac99d3306f54539b7')
+
+prepare() {
+ cd "$srcdir"/${_pkgbase}
+ git am ../0001-hack-to-fix-build-on-Arch.patch
+}
pkgver() {
cd "$srcdir"/${_pkgbase}
--
2.11.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment