aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2017-11-14 19:52:16 +0100
committerJakub Jirutka <jakub@jirutka.cz>2017-11-14 19:52:40 +0100
commit7884113f6a48c8452e6fdef5337bab4ef75315bc (patch)
tree1bb5ba089b27947205425045bef7406c42c2d84d
parentf19a7ede290a181bedb7073debf678b84d3d7e5b (diff)
downloadaports-7884113f6a48c8452e6fdef5337bab4ef75315bc.tar.bz2
aports-7884113f6a48c8452e6fdef5337bab4ef75315bc.tar.xz
main/mesa: fix drmdeps.patch
-rw-r--r--main/mesa/APKBUILD2
-rw-r--r--main/mesa/drmdeps.patch35
2 files changed, 19 insertions, 18 deletions
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index f3dafce26b..2ca41f698d 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -240,4 +240,4 @@ sha512sums="665b63aab6af3f8f263f182d85d9ad71db7a23bcbaf67d62fe53c258cb0f600266ac
c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a glx_ro_text_segm.patch
163bb96773686a7446f40a8415acef762910afb2f4f2271d429d9cbd9e3048111c8c0023c1f072fa63f33b68b2aea9d066efd9083904265151eeccbe8ccb7227 musl-fixes.patch
c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch
-1b2edb267d8bf54f68a8d886b838933d3aed91a1a19805ed9235c3e715a1a27847891279aa9a87fa8f799d2b39a18f12072b579e7d0c39fe7901c07b5fa64e8a drmdeps.patch"
+1771179e603d1b32a2619eb9b6c166eb7ce82cbc774b3c47d2351bbf69c8e3c0bd26f1c4d3d4fa95d05ea886e2cc74f4fae1210d6d5790de146f9fb9e42bdb30 drmdeps.patch"
diff --git a/main/mesa/drmdeps.patch b/main/mesa/drmdeps.patch
index d6caf89044..2cb421ce3e 100644
--- a/main/mesa/drmdeps.patch
+++ b/main/mesa/drmdeps.patch
@@ -1,5 +1,5 @@
---- a/src/gallium/winsys/radeon/drm/Makefile.am 2017-08-10 11:45:20.737377457 -0400
-+++ b/src/gallium/winsys/radeon/drm/Makefile.am 2017-08-10 11:50:23.414534307 -0400
+--- a/src/gallium/winsys/radeon/drm/Makefile.am
++++ b/src/gallium/winsys/radeon/drm/Makefile.am
@@ -7,4 +7,6 @@
noinst_LTLIBRARIES = libradeonwinsys.la
@@ -7,8 +7,8 @@
+libradeonwinsys_la_LIBADD = -ldrm_radeon
+
libradeonwinsys_la_SOURCES = $(C_SOURCES)
---- a/src/gallium/winsys/radeon/drm/Makefile.in 2017-08-10 11:45:25.577298181 -0400
-+++ b/src/gallium/winsys/radeon/drm/Makefile.in 2017-08-10 11:57:11.151189074 -0400
+--- a/src/gallium/winsys/radeon/drm/Makefile.in
++++ b/src/gallium/winsys/radeon/drm/Makefile.in
@@ -118,7 +118,7 @@
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -18,23 +18,24 @@
am__objects_1 = radeon_drm_bo.lo radeon_drm_cs.lo \
radeon_drm_surface.lo radeon_drm_winsys.lo
am_libradeonwinsys_la_OBJECTS = $(am__objects_1)
---- a/src/gallium/winsys/amdgpu/drm/Makefile.am 2017-08-10 11:58:51.446212948 -0400
-+++ b/src/gallium/winsys/amdgpu/drm/Makefile.am 2017-08-10 11:57:54.447146570 -0400
-@@ -10,5 +10,5 @@
-
+--- a/src/gallium/winsys/amdgpu/drm/Makefile.am
++++ b/src/gallium/winsys/amdgpu/drm/Makefile.am
+@@ -11,6 +11,6 @@
noinst_LTLIBRARIES = libamdgpuwinsys.la
--libamdgpuwinsys_la_LIBADD = $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la
-+libamdgpuwinsys_la_LIBADD = $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la -ldrm_amdgpu
- libamdgpuwinsys_la_SOURCES = $(C_SOURCES)
---- a/src/gallium/winsys/amdgpu/drm/Makefile.in 2017-08-10 11:59:12.009209467 -0400
-+++ b/src/gallium/winsys/amdgpu/drm/Makefile.in 2017-08-10 11:58:23.626668621 -0400
-@@ -561,7 +561,7 @@
+ libamdgpuwinsys_la_LIBADD = \
+- $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la
++ $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la -ldrm_amdgpu
+ libamdgpuwinsys_la_SOURCES = $(C_SOURCES)
+--- a/src/gallium/winsys/amdgpu/drm/Makefile.in
++++ b/src/gallium/winsys/amdgpu/drm/Makefile.in
+@@ -565,7 +565,7 @@
AM_CXXFLAGS = $(AM_CFLAGS)
noinst_LTLIBRARIES = libamdgpuwinsys.la
--libamdgpuwinsys_la_LIBADD = $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la
-+libamdgpuwinsys_la_LIBADD = $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la -ldrm_amdgpu
+ libamdgpuwinsys_la_LIBADD = \
+- $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la
++ $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la -ldrm_amdgpu
+
libamdgpuwinsys_la_SOURCES = $(C_SOURCES)
all: all-am
-