Merge pull request #9263 from suvari/master

cogl: fix build, clean unuseds
This commit is contained in:
Kamil ATLI
2021-04-24 12:23:10 +03:00
committed by GitHub
6 changed files with 248287 additions and 248276 deletions
+3
View File
@@ -18,6 +18,9 @@ def setup():
--enable-gles2 \
--enable-{kms,wayland,xlib}-egl-platform \
--enable-wayland-egl-server")
# for fix unused dependency
pisitools.dosed("libtool"," -shared ", " -Wl,-O1,--as-needed -shared ")
def build():
autotools.make()
+36 -24
View File
@@ -1,3 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>cogl</Name>
@@ -13,24 +15,30 @@
<Archive sha1sum="e6c4d07681416c9918d1efeaa87ef0de666c58ea">https://gitlab.gnome.org/GNOME/cogl/-/archive/1.22.6/cogl-1.22.6.tar.gz</Archive>
<BuildDependencies>
<Dependency>pango-devel</Dependency>
<Dependency>gnome-common</Dependency>
<!-- <Dependency>gnome-common</Dependency> -->
<Dependency>cairo-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
<!-- <Dependency>gtk2-devel</Dependency> -->
<Dependency>mesa-devel</Dependency>
<Dependency>zenity</Dependency>
<!-- <Dependency>zenity</Dependency> -->
<Dependency>libXext-devel</Dependency>
<Dependency>libXrender-devel</Dependency>
<!-- <Dependency>libXrender-devel</Dependency> -->
<Dependency>libXfixes-devel</Dependency>
<Dependency>libXdamage-devel</Dependency>
<Dependency versionFrom="0.4.0">libXcomposite-devel</Dependency>
<Dependency>xcb-util-devel</Dependency>
<Dependency versionFrom="0.4.5">libXcomposite-devel</Dependency>
<!-- <Dependency>xcb-util-devel</Dependency> -->
<Dependency>json-glib-devel</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
<Dependency>gdk-pixbuf-devel</Dependency>
<Dependency>glslang</Dependency>
<Dependency>glslang-devel</Dependency>
<!-- <Dependency>glslang-devel</Dependency> -->
<Dependency>gtk-doc</Dependency>
<Dependency>valgrind</Dependency>
<Dependency>libXrandr-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>libglvnd-devel</Dependency>
<Dependency>wayland-devel</Dependency>
<Dependency>harfbuzz-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libdrm-devel</Dependency>
</BuildDependencies>
</Source>
@@ -38,23 +46,30 @@
<Name>cogl</Name>
<RuntimeDependencies>
<Dependency>pango</Dependency>
<Dependency>gnome-common</Dependency>
<!-- <Dependency>gnome-common</Dependency> -->
<Dependency>cairo</Dependency>
<Dependency>gtk2</Dependency>
<!-- <Dependency>gtk2</Dependency> -->
<Dependency>mesa</Dependency>
<Dependency>libXext</Dependency>
<Dependency>zenity</Dependency>
<Dependency>libXrender</Dependency>
<!-- <Dependency>zenity</Dependency> -->
<!-- <Dependency>libXrender</Dependency> -->
<Dependency>libXfixes</Dependency>
<Dependency>libXdamage</Dependency>
<Dependency versionFrom="0.4.0">libXcomposite</Dependency>
<Dependency>xcb-util</Dependency>
<!-- <Dependency>xcb-util</Dependency> -->
<Dependency>json-glib</Dependency>
<Dependency>atk</Dependency>
<Dependency>libXi</Dependency>
<!-- <Dependency>atk</Dependency> -->
<!-- <Dependency>libXi</Dependency> -->
<Dependency>gdk-pixbuf</Dependency>
<Dependency>glslang</Dependency>
<Dependency>glslang-devel</Dependency>
<!-- <Dependency>glslang</Dependency> -->
<Dependency>libglvnd</Dependency>
<Dependency>libXrandr</Dependency>
<Dependency>glib2</Dependency>
<Dependency>wayland-client</Dependency>
<Dependency>wayland-server</Dependency>
<Dependency>wayland</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libdrm</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
@@ -70,23 +85,20 @@
<Summary>Development files for cogl</Summary>
<RuntimeDependencies>
<Dependency release="current">cogl</Dependency>
<Dependency>atk-devel</Dependency>
<Dependency>gdk-pixbuf</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>libXi-devel</Dependency>
<Dependency>pango-devel</Dependency>
<Dependency>cairo-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libdrm-devel</Dependency>
<Dependency>libXext-devel</Dependency>
<Dependency>json-glib-devel</Dependency>
<Dependency>wayland-devel</Dependency>
<Dependency>libglvnd-devel</Dependency>
<Dependency>libXfixes-devel</Dependency>
<Dependency>libXrandr-devel</Dependency>
<Dependency>gdk-pixbuf-devel</Dependency>
<Dependency>libXdamage-devel</Dependency>
<Dependency>libXcomposite-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>glslang</Dependency>
<Dependency>glslang-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
+248246 -248250
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
689a4badff87ad1475bcc7da2551034fde250239
7f8c85800c9edd3dc5e72775cc872cb26d4fc56f
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -1 +1 @@
fbbc2450d130f5ee0d17edc1c59e1e1b7642d321
4664ad028ad6ebc76e9a4bf8229d3695daf03bab