muffin: update to 4.6.0.

This commit is contained in:
mobinmob 2020-05-25 18:46:54 +03:00 committed by Helmut Pozimski
parent 4373a6d063
commit f8a0434ddf
3 changed files with 2 additions and 51 deletions

View file

@ -1,36 +0,0 @@
--- cogl/configure.ac 2019-07-25 10:27:05.000000000 +0200
+++ cogl/configure.ac 2020-01-26 18:24:57.704883594 +0100
@@ -486,8 +486,9 @@
AC_SUBST([COGL_EGL_INCLUDES])
AC_CHECK_HEADERS([EGL/eglext.h],
- [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE
-#include <EGL/eglext.h>"],
+ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
+#include <EGL/eglext.h>
+#include <EGL/eglmesaext.h"],
[],
[$COGL_EGL_INCLUDES])
@@ -749,6 +750,11 @@
[],
[AC_MSG_ERROR([Unable to locate required EGL headers])],
[#include <EGL/egl.h>])
+ AC_CHECK_HEADERS(
+ [EGL/eglmesaext.h],
+ [],
+ [AC_MSG_ERROR([Unable to locate required EGL headers])],
+ [#include <EGL/egl.h>])
AC_CHECK_LIB(EGL, [eglInitialize],
[COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"],
@@ -759,7 +765,8 @@
)
COGL_EGL_INCLUDES="#include <EGL/egl.h>
-#include <EGL/eglext.h>"
+#include <EGL/eglext.h>
+#include <EGL/eglmesaext.h>"
AC_SUBST([COGL_EGL_INCLUDES])
])

View file

@ -1,13 +0,0 @@
--- src/libmuffin.pc.in
+++ src/libmuffin.pc.in
@@ -2,8 +2,8 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-girdir=@libdir@/muffin
-typelibdir=@libdir@/muffin
+girdir=${pc_sysrootdir}@libdir@/muffin
+typelibdir=${pc_sysrootdir}@libdir@/muffin
apiversion=@MUFFIN_PLUGIN_API_VERSION@
muffin_major_version=@MUFFIN_MAJOR_VERSION@

View file

@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
version=4.4.2
version=4.6.0
revision=1
build_style=gnu-configure
build_helper=gir
@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=1c7a98e1a0fa9356d7c166166830bdb043079cdb7ff8d3dd6dc817e29852a52a
checksum=a8f1cb8e495b5fdb146dc4758f83266018d2d8585ce436c6106b3d95d178b262
shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
libmuffin-cogl-path-0.so libmuffin-cogl-0.so"