wayfire: fix build on musl

This commit is contained in:
John 2019-02-13 15:01:41 +01:00 committed by maxice8
parent c6bceac65c
commit 09501dafe0
2 changed files with 24 additions and 2 deletions

View File

@ -0,0 +1,22 @@
--- src/api/img.hpp 2019-02-05 15:46:42.000000000 +0100
+++ - 2019-02-13 14:59:35.302813580 +0100
@@ -5,8 +5,6 @@
#include <GLES2/gl2.h>
#include <string>
-#define ulong unsigned long
-
namespace image_io
{
/* Load the image from the given file, binding it to the given GL texture target
--- src/core/img.cpp 2019-02-05 15:46:42.000000000 +0100
+++ - 2019-02-13 14:59:57.760169039 +0100
@@ -19,7 +19,7 @@
namespace image_io {
using Loader = std::function<bool(const char *, GLuint)>;
- using Writer = std::function<void(const char *name, uint8_t *pixels, ulong, ulong)>;
+ using Writer = std::function<void(const char *name, uint8_t *pixels, unsigned long, unsigned long)>;
namespace {
std::unordered_map<std::string, Loader> loaders;
std::unordered_map<std::string, Writer> writers;

View File

@ -12,8 +12,8 @@ homepage="https://wayfire.org"
distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz" distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz"
checksum=ce6ed0ba62296992f4a0c05b92d05b33911d1d192346611df845414ffd9a18b8 checksum=ce6ed0ba62296992f4a0c05b92d05b33911d1d192346611df845414ffd9a18b8
case "$XBPS_TARGET_MACHINE" in case $XBPS_TARGET_MACHINE in
*-musl) broken="execinfo.h" ;; *-musl) makedepends+=" libexecinfo-devel"
esac esac
post_install() { post_install() {