diff --git a/mingw-w64-goxel/001-goxel-0.10.7-msys-mingw.patch b/mingw-w64-goxel/001-goxel-0.11.0-msys-mingw.patch similarity index 70% rename from mingw-w64-goxel/001-goxel-0.10.7-msys-mingw.patch rename to mingw-w64-goxel/001-goxel-0.11.0-msys-mingw.patch index 453087d72a..64c6a3cc36 100644 --- a/mingw-w64-goxel/001-goxel-0.10.7-msys-mingw.patch +++ b/mingw-w64-goxel/001-goxel-0.11.0-msys-mingw.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index d4f9fb98..73164f4a 100644 +index 18e07a60..616fbf81 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ all: @@ -12,7 +12,7 @@ index d4f9fb98..73164f4a 100644 profile: scons mode=profile diff --git a/SConstruct b/SConstruct -index f190dfc3..3b6e5143 100644 +index c55c9a0c..7073bcf4 100644 --- a/SConstruct +++ b/SConstruct @@ -29,9 +29,9 @@ vars.AddVariables( @@ -38,13 +38,20 @@ index f190dfc3..3b6e5143 100644 # Asan & Ubsan (need to come first). if env['mode'] == 'debug' and target_os == 'posix': env.Append(CCFLAGS=['-fsanitize=address', '-fsanitize=undefined'], -@@ -104,8 +100,7 @@ if target_os == 'msys': +@@ -103,12 +99,10 @@ if target_os == 'posix': + if target_os == 'msys': env.Append(CXXFLAGS=['-Wno-attributes', '-Wno-unused-variable', '-Wno-unused-function']) - env.Append(LIBS=['glfw3', 'opengl32', 'Imm32', 'gdi32', 'Comdlg32', +- env.Append(LIBS=['glfw3', 'opengl32', 'Imm32', 'gdi32', 'Comdlg32', - 'z', 'tre', 'intl', 'iconv'], - LINKFLAGS='--static') +- sources += glob.glob('ext_src/glew/glew.c') +- env.Append(CPPPATH=['ext_src/glew']) +- env.Append(CPPDEFINES=['GLEW_STATIC', 'FREE_WINDOWS']) ++ env.Append(LIBS=['opengl32', 'Imm32', 'gdi32', 'Comdlg32', + 'z', 'tre', 'intl', 'iconv']) - sources += glob.glob('ext_src/glew/glew.c') - env.Append(CPPPATH=['ext_src/glew']) - env.Append(CPPDEFINES=['GLEW_STATIC', 'FREE_WINDOWS']) ++ env.ParseConfig('pkg-config --cflags --libs glfw3 glew') ++ env.Append(CPPDEFINES=['FREE_WINDOWS']) + + # OSX Compilation support. + if target_os == 'darwin': diff --git a/mingw-w64-goxel/PKGBUILD b/mingw-w64-goxel/PKGBUILD index 97b17457a5..7c8cfac62b 100644 --- a/mingw-w64-goxel/PKGBUILD +++ b/mingw-w64-goxel/PKGBUILD @@ -3,7 +3,7 @@ _realname=goxel pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} -pkgver=0.10.8 +pkgver=0.11.0 pkgrel=1 pkgdesc="3D program that lets you create voxel volumes (mingw-w64)" arch=('any') @@ -11,6 +11,7 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang32' 'clang64') url="https://goxel.xyz/" license=('GPL3') depends=("${MINGW_PACKAGE_PREFIX}-glfw" + "${MINGW_PACKAGE_PREFIX}-glew" "${MINGW_PACKAGE_PREFIX}-libpng" "${MINGW_PACKAGE_PREFIX}-libiconv" "${MINGW_PACKAGE_PREFIX}-gettext" @@ -19,28 +20,28 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-scons" "${MINGW_PACKAGE_PREFIX}-pkgconf" "${MINGW_PACKAGE_PREFIX}-cc") source=("$_realname-$pkgver.tar.gz::https://github.com/guillaumechereau/$_realname/archive/v$pkgver.tar.gz" - "001-goxel-0.10.7-msys-mingw.patch") -sha256sums=('98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a' - 'c7926b9d774ae9337679abf0d7a3be0783f6832ee29ab6db16be07eafa3c7c94') + "001-goxel-0.11.0-msys-mingw.patch") +sha256sums=('660030e1b3b33a3e909d8189780a192cba059774af57b042ecb63297f2a6d0fc' + 'd2fdc56fa3ca85c89c8f843423177a2b58cd2346bed53da19201ef5059da6cd0') prepare() { cd $_realname-$pkgver - patch -Np1 -i "${srcdir}/001-goxel-0.10.7-msys-mingw.patch" + patch -Np1 -i "${srcdir}/001-goxel-0.11.0-msys-mingw.patch" } build() { - msg "Build for ${CARCH}" + msg "Build for ${MSYSTEM}" - rm -rf build-${CARCH} | true - cp -r "${_realname}-${pkgver}" "build-${CARCH}" - cd "${srcdir}/build-${CARCH}" + rm -rf build-${MSYSTEM} | true + cp -r "${_realname}-${pkgver}" "build-${MSYSTEM}" + cd "${srcdir}/build-${MSYSTEM}" make release } package() { - cd "${srcdir}/build-${CARCH}" + cd "${srcdir}/build-${MSYSTEM}" make DESTDIR="$pkgdir" PREFIX=${MINGW_PREFIX} install