Skip to content

Commit

Permalink
Patch src/amdgpu_glamor.c to remove dead call
Browse files Browse the repository at this point in the history
xorg/xserver no longer exports glamor_egl_destroy_textured_pixmap,
instead assuming that fbDestroyPixmap will call it, and thus calling it
outside of the xserver codebase is redundant.  Removing the call
prevents a runtime link error when loading amdgpu_drv.so, and doesn't
seem to cause a system (running a modern xorg-server) to catch fire.
  • Loading branch information
Haifen committed Nov 19, 2015
1 parent cb3fd19 commit 4dfaa8e
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
3 changes: 2 additions & 1 deletion x11-drivers/xf86-video-amdgpu/Manifest
@@ -1 +1,2 @@
EBUILD xf86-video-amdgpu-9999.ebuild 920 SHA256 26464162f9551718a77a3075aa0882a41c784544228a5359059f82d1256b8741 SHA512 129a34a84f105564bca011a2c5866f8965b75a6082a762d69d2eb60e04bd8022189a2caaf4b1520e224225b6a4319d2e2195c5c1883c64a230fd344f4403f76f WHIRLPOOL 0aa8b03b564c05f703fd7a056257105c0a9f033f255e65a93376fb633cc285ee0374a5e819bb4dea7d09c9fe3423509e9e9116c6f619ccac5c7182a494214a08
AUX xf86-video-amdgpu-9999-dont_call_glamor_egl_destroy_pixmap.patch 366 SHA256 2f29e87ede831ba6299498fa7b2118e021347306defa8b9a932028dc0330a9de SHA512 62c71ea9d270d5ec595892704f02c461665a8c119ae8642d5093f769cd1d985a8c7d4c03c0bc0783dbdf6e5604155f2aa2a2dc0b33c7f753cd2c1bd82d2d7dac WHIRLPOOL 19344fe60aaf08a805ef0f9903058236e36d15677836d98f346a0375bc2cbe589f394d7f2b41cd5ca0b2ef5d2a0e10a5ebd0a2582dcaabf5f1c15a1c6105eaeb
EBUILD xf86-video-amdgpu-9999.ebuild 1029 SHA256 320c06ee9e3dbbd963003a64b6856d0213170553d03cc42483783806233e2a72 SHA512 ec9cdd6a9138ef9e4c50b21324e5c7506f89ebdbe8428a40516bb5981c5d6f3968bfd2a18936e190cf9dbc10341066f773a5c359e59d25c9090bfbfb3c7bd504 WHIRLPOOL cca95329aa4592b0d95afcafe7c44e43322a101c06e5e0a4d77cce6dbb726f5e3154b114bfc54c41095ea69cdebbcdc3b040b44eab068339f0c2a23ff748da80
@@ -0,0 +1,12 @@
diff --git a/src/amdgpu_glamor.c b/src/amdgpu_glamor.c
index c979561..9483e2d 100644
--- a/src/amdgpu_glamor.c
+++ b/src/amdgpu_glamor.c
@@ -249,7 +249,6 @@ static Bool amdgpu_glamor_destroy_pixmap(PixmapPtr pixmap)
amdgpu_bo_unmap(bo);
}

- glamor_egl_destroy_textured_pixmap(pixmap);
amdgpu_set_pixmap_bo(pixmap, NULL);
}
fbDestroyPixmap(pixmap);
6 changes: 6 additions & 0 deletions x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
Expand Up @@ -21,6 +21,12 @@ DEPEND="x11-libs/libdrm[video_cards_amdgpu]
udev? ( virtual/udev )"
RDEPEND="${DEPEND}"

src_prepare() {
epatch "${FILESDIR}/${P}-dont_call_glamor_egl_destroy_pixmap.patch"

xorg-2_src_prepare
}

pkg_pretend() {
if use kernel_linux ; then
if kernel_is -ge 3 19; then
Expand Down

0 comments on commit 4dfaa8e

Please sign in to comment.