* [gentoo-commits] repo/gentoo:master commit in: x11-misc/picom/files/, x11-misc/picom/
@ 2019-12-10 9:26 Bernard Cafarelli
0 siblings, 0 replies; 2+ messages in thread
From: Bernard Cafarelli @ 2019-12-10 9:26 UTC (permalink / raw
To: gentoo-commits
commit: 4ea1dee39f8e443d65e1a13f28b25e6a50d5d147
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 09:26:12 2019 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 09:26:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea1dee3
x11-misc/picom: fix compilation with USE=-opengl
Closes: https://bugs.gentoo.org/702376
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
x11-misc/picom/files/picom-7.5-no_opengl.patch | 27 ++++++++++++++++++++++++++
x11-misc/picom/picom-7.5.ebuild | 4 ++++
2 files changed, 31 insertions(+)
diff --git a/x11-misc/picom/files/picom-7.5-no_opengl.patch b/x11-misc/picom/files/picom-7.5-no_opengl.patch
new file mode 100644
index 00000000000..ca9f715140e
--- /dev/null
+++ b/x11-misc/picom/files/picom-7.5-no_opengl.patch
@@ -0,0 +1,27 @@
+From bd5a5fb56812ee5644e4c4bd1fdd82b9899317a7 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sat, 12 Oct 2019 13:29:10 +0000
+Subject: [PATCH] Unbreak -Dopengl=false clean build
+
+In file included from ../src/x.c:17:
+../src/backend/gl/glx.h:10:10: fatal error: 'GL/glx.h' file not found
+ #include <GL/glx.h>
+ ^~~~~~~~~~
+---
+ src/x.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/x.c b/src/x.c
+index ed6668a8..2f802f1e 100644
+--- a/src/x.c
++++ b/src/x.c
+@@ -14,7 +14,9 @@
+ #include <xcb/xfixes.h>
+
+ #include "atom.h"
++#ifdef CONFIG_OPENGL
+ #include "backend/gl/glx.h"
++#endif
+ #include "common.h"
+ #include "compiler.h"
+ #include "kernel.h"
diff --git a/x11-misc/picom/picom-7.5.ebuild b/x11-misc/picom/picom-7.5.ebuild
index bec768b6fec..5c07720ed5f 100644
--- a/x11-misc/picom/picom-7.5.ebuild
+++ b/x11-misc/picom/picom-7.5.ebuild
@@ -39,6 +39,10 @@ DEPEND="${RDEPEND}
BDEPEND="virtual/pkgconfig
doc? ( app-text/asciidoc )"
+PATCHES=(
+ "${FILESDIR}"/${P}-no_opengl.patch
+ )
+
src_configure() {
local emesonargs=(
$(meson_use config-file config_file)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/picom/files/, x11-misc/picom/
@ 2020-10-24 9:25 Bernard Cafarelli
0 siblings, 0 replies; 2+ messages in thread
From: Bernard Cafarelli @ 2020-10-24 9:25 UTC (permalink / raw
To: gentoo-commits
commit: cbaad9176a4704214463bd1fde5c95eedbb8c310
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 09:22:01 2020 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 09:24:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbaad917
x11-misc/picom: drop old
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
x11-misc/picom/Manifest | 1 -
x11-misc/picom/files/picom-7.5-no_opengl.patch | 27 -----------
x11-misc/picom/picom-7.5-r1.ebuild | 64 --------------------------
3 files changed, 92 deletions(-)
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index 8ef3f773a27..df2265e2a53 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -1,3 +1,2 @@
-DIST picom-7.5.tar.gz 219456 BLAKE2B 54113547b575ad6aa1329e92ae331b7d49207fdcdc6b49d31d8ab125f7335730a7e53b260c6a6c33d5350bec1e9e6357fd34023dc7837de165289446f8f492b8 SHA512 6535e5eab1a243bbee62448bc48830b7ea3566f94b2c45d9ca76fd8b8056e1f00e55f0e4b58110364d2c4f56652cc005622d644c1db1db41d2811ecc19e6d44a
DIST picom-8.1.tar.gz 242262 BLAKE2B 69583a7a188f62387f0784e33acfc3d84e6b7b1987f44f7634b1bd2244ae8e8763c2131a824f8ddd748558002a876cb359c656a93fcb55ad33a24cca2b7dc56e SHA512 d1d0428e5761db6820c775c07b966b5fec6a9e9d049ba9f555eb49721f855a018df7242ef61e29c0ea003644b20e1bb733ddf668053a8d4040240e98707fa4d3
DIST picom-8.tar.gz 242059 BLAKE2B cfeec7f40eaa43c115bd326abeaa547553f7bdd22a2e6b2a96f46d87c164b0e9403a876f069077e3b85d11af685aadb0cff2a4e7df2cf87646f2552f9c1a01df SHA512 154dd42dea16aca463e7d7f9913a8f10740df892bfdda2fee210a94b13c8eaf6201b35e505daf45075fdb1980bb9b85adf170b649702c1b1e2fcdc1d88406b4a
diff --git a/x11-misc/picom/files/picom-7.5-no_opengl.patch b/x11-misc/picom/files/picom-7.5-no_opengl.patch
deleted file mode 100644
index ca9f715140e..00000000000
--- a/x11-misc/picom/files/picom-7.5-no_opengl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From bd5a5fb56812ee5644e4c4bd1fdd82b9899317a7 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Sat, 12 Oct 2019 13:29:10 +0000
-Subject: [PATCH] Unbreak -Dopengl=false clean build
-
-In file included from ../src/x.c:17:
-../src/backend/gl/glx.h:10:10: fatal error: 'GL/glx.h' file not found
- #include <GL/glx.h>
- ^~~~~~~~~~
----
- src/x.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/x.c b/src/x.c
-index ed6668a8..2f802f1e 100644
---- a/src/x.c
-+++ b/src/x.c
-@@ -14,7 +14,9 @@
- #include <xcb/xfixes.h>
-
- #include "atom.h"
-+#ifdef CONFIG_OPENGL
- #include "backend/gl/glx.h"
-+#endif
- #include "common.h"
- #include "compiler.h"
- #include "kernel.h"
diff --git a/x11-misc/picom/picom-7.5-r1.ebuild b/x11-misc/picom/picom-7.5-r1.ebuild
deleted file mode 100644
index b2473732a34..00000000000
--- a/x11-misc/picom/picom-7.5-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit meson python-r1 xdg
-
-DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
-HOMEPAGE="https://github.com/yshui/picom"
-SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+config-file dbus +doc +drm opengl pcre"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/libev
- dev-libs/uthash
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXext
- x11-libs/pixman
- x11-libs/xcb-util-image
- x11-libs/xcb-util-renderutil
- config-file? (
- dev-libs/libconfig
- dev-libs/libxdg-basedir
- )
- dbus? ( sys-apps/dbus )
- drm? ( x11-libs/libdrm )
- opengl? ( virtual/opengl )
- pcre? ( dev-libs/libpcre )
- !x11-misc/compton"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig
- doc? ( app-text/asciidoc )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-no_opengl.patch
- )
-
-src_configure() {
- local emesonargs=(
- $(meson_use config-file config_file)
- $(meson_use dbus)
- $(meson_use doc build_docs)
- $(meson_use opengl)
- $(meson_use pcre regex)
- )
-
- meson_src_configure
-
-}
-
-src_install() {
- meson_src_install
-
- python_replicate_script "${ED}"/usr/bin/compton-convgen.py
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-24 9:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-10 9:26 [gentoo-commits] repo/gentoo:master commit in: x11-misc/picom/files/, x11-misc/picom/ Bernard Cafarelli
-- strict thread matches above, loose matches on Subject: below --
2020-10-24 9:25 Bernard Cafarelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox