From db8f9d750317f57ad520f6465931650f9e78e310 Mon Sep 17 00:00:00 2001 From: debasishbsws Date: Mon, 12 Aug 2024 06:36:48 +0000 Subject: [PATCH 1/6] feat(gst-plugins): Added gst-plugins-bad and enable gl plugins in gst-plugins-base enabling gl phugins as it is required to build gtk-4 Signed-off-by: debasishbsws --- gst-plugins-bad.yaml | 84 +++++++++++++++++++++++++++++++++++++++++++ gst-plugins-base.yaml | 39 ++++++++++++-------- 2 files changed, 108 insertions(+), 15 deletions(-) create mode 100644 gst-plugins-bad.yaml diff --git a/gst-plugins-bad.yaml b/gst-plugins-bad.yaml new file mode 100644 index 0000000000..770d6c7bcf --- /dev/null +++ b/gst-plugins-bad.yaml @@ -0,0 +1,84 @@ +package: + name: gst-plugins-bad + version: 1.24.6 + epoch: 0 + description: GStreamer streaming media framework bad plug-ins + copyright: + - license: GPL-2.0-or-later AND LGPL-2.0-or-later + +environment: + contents: + packages: + - alsa-lib-dev + - build-base + - busybox + - ca-certificates-bundle + - cdparanoia-dev + - cmake + - expat-dev + - gdk-pixbuf + - glib-dev + - glib-gir + - gobject-introspection-dev + - graphene-dev + - gst-plugins-base-dev + - gstreamer + - gstreamer-dev + - gtk-3-dev + - libdrm-dev + - libice-dev + - libogg-dev + - libsm-dev + - libtheora-dev + - libvorbis-dev + - libxv-dev + - mesa-dev + - mesa-gbm + - mesa-gl + - mesa-glapi + - mesa-gles + - meson + - opus-dev + - orc-compiler + - orc-dev + - perl + +pipeline: + - uses: fetch + with: + expected-sha256: 8f4d965513e7827c1f547c1e749e4ef2812b371974fe64857fe5029a19c5b64c + uri: https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${{package.version}}.tar.xz + + - uses: meson/configure + with: + opts: | + -Db_lto=true \ + -Dpackage-origin="https://github.com/wolfi-dev" \ + -Dpackage-name="GStreamer bad plug-ins (Wolfi-Linux)" \ + -Dintrospection=enabled \ + -Dsctp=enabled \ + + - uses: meson/compile + + - uses: meson/install + + - uses: strip + +subpackages: + - name: ${{package.name}}-dev + dependencies: + runtime: + - ${{package.name}} + pipeline: + - uses: split/dev + description: ${{package.name}} dev + + - name: ${{package.name}}-doc + pipeline: + - uses: split/manpages + description: ${{package.name}} manpages + +update: + enabled: true + release-monitor: + identifier: 21849 diff --git a/gst-plugins-base.yaml b/gst-plugins-base.yaml index 6404f44638..629ee31fb3 100644 --- a/gst-plugins-base.yaml +++ b/gst-plugins-base.yaml @@ -1,7 +1,7 @@ package: name: gst-plugins-base version: 1.24.6 - epoch: 0 + epoch: 1 description: GStreamer streaming media framework base plug-ins copyright: - license: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -24,6 +24,7 @@ environment: - gstreamer - gstreamer-dev - gtk-3-dev + - libdrm-dev - libice-dev - libogg-dev - libsm-dev @@ -31,6 +32,10 @@ environment: - libvorbis-dev - libxv-dev - mesa-dev + - mesa-gbm + - mesa-gl + - mesa-glapi + - mesa-gles - meson - opus-dev - orc-compiler @@ -43,36 +48,40 @@ pipeline: expected-sha512: a098a54cf1d329cd1576e591b10cb0b82861e895cb233f34e8122725993fd5ed48017e127ac67ff1c98cb60e855fb94036368434b5aa9d211d6572e410131731 uri: https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${{package.version}}.tar.xz - - runs: | - meson \ - --prefix=/usr \ - -Dalsa=enabled \ - -Dintrospection=enabled \ + - uses: meson/configure + with: + opts: | + -Dalsa=enabled \ + -Dintrospection=enabled \ + -Dgl=enabled \ + -Dgl-graphene=enabled \ + -Dgl-jpeg=enabled \ + -Dgl-png=enabled \ -Dtests=disabled \ - . output - meson compile -C output - DESTDIR="${{targets.destdir}}" meson install --no-rebuild -C output + - uses: meson/compile + + - uses: meson/install - uses: strip subpackages: - - name: gst-plugins-base-dev + - name: ${{package.name}}-dev pipeline: - uses: split/dev - description: gst-plugins-base dev + description: ${{package.name}} dev - - name: gst-plugins-base-doc + - name: ${{package.name}}-doc pipeline: - uses: split/manpages - description: gst-plugins-base manpages + description: ${{package.name}} manpages - - name: gst-plugins-base-lang + - name: ${{package.name}}-lang pipeline: - runs: | mkdir -p ${{targets.subpkgdir}}/usr/share/locale mv ${{targets.destdir}}/usr/share/locale ${{targets.subpkgdir}}/usr/share/locale - description: gst-plugins-base lang + description: ${{package.name}} lang update: enabled: true From 582a5f5261ee13ac15853f25df6bf78b9f9d13ff Mon Sep 17 00:00:00 2001 From: debasishbsws Date: Mon, 12 Aug 2024 07:26:47 +0000 Subject: [PATCH 2/6] feat(new package): add new package libsass and sassc both package are neede to create gtk-4 Signed-off-by: debasishbsws --- libsass.yaml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ sassc.yaml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 libsass.yaml create mode 100644 sassc.yaml diff --git a/libsass.yaml b/libsass.yaml new file mode 100644 index 0000000000..0b51ee0c22 --- /dev/null +++ b/libsass.yaml @@ -0,0 +1,50 @@ +package: + name: libsass + version: "3.6.6" + epoch: 0 + description: C/C++ implementation of a Sass compiler + copyright: + - license: MIT + +environment: + contents: + packages: + - build-base + - busybox + - ca-certificates-bundle + - libtool + - wolfi-baselayout + +pipeline: + - uses: git-checkout + with: + repository: https://github.com/sass/libsass + tag: ${{package.version}} + expected-commit: 7037f03fabeb2b18b5efa84403f5a6d7a990f460 + + - runs: autoreconf -vfi + + - uses: autoconf/configure + with: + opts: | + --disable-static + + - uses: autoconf/make + + - uses: autoconf/make-install + + - uses: strip + +subpackages: + - name: ${{package.name}}-dev + description: C/C++ implementation of a Sass compiler - development files + dependencies: + runtime: + - libsass + pipeline: + - uses: split/dev + +update: + enabled: true + github: + identifier: sass/libsass diff --git a/sassc.yaml b/sassc.yaml new file mode 100644 index 0000000000..907d2a0f24 --- /dev/null +++ b/sassc.yaml @@ -0,0 +1,44 @@ +package: + name: sassc + version: "3.6.2" + epoch: 0 + description: Libsass command line driver + copyright: + - license: MIT + +environment: + contents: + packages: + - build-base + - busybox + - ca-certificates-bundle + - libsass-dev + - libtool + - wolfi-baselayout + +pipeline: + - uses: git-checkout + with: + repository: https://github.com/sass/sassc + tag: ${{package.version}} + expected-commit: 66f0ef37e7f0ad3a65d2f481eff09d09408f42d0 + + - runs: | + cat <<- __EOF__ > version.sh + echo ${{package.version}} + __EOF__ + ./script/bootstrap + autoreconf -vfi + + - uses: autoconf/configure + + - uses: autoconf/make + + - uses: autoconf/make-install + + - uses: strip + +update: + enabled: true + github: + identifier: sass/libsass From 63d7ef6906e9ad7f365bfcca8938a5c5da0864f5 Mon Sep 17 00:00:00 2001 From: debasishbsws Date: Mon, 12 Aug 2024 07:59:53 +0000 Subject: [PATCH 3/6] feat(new package): Add package unifdef and shaderc shaderc have a TODO: we need to remove the direct fetching of dependency and use System ones so that It do not make conflict with other dependency Like SPIRV-Tools and libs Signed-off-by: debasishbsws --- shaderc.yaml | 42 ++++++++++++++++++++++++++++++++++++++++++ unifdef.yaml | 29 +++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 shaderc.yaml create mode 100644 unifdef.yaml diff --git a/shaderc.yaml b/shaderc.yaml new file mode 100644 index 0000000000..496ff35883 --- /dev/null +++ b/shaderc.yaml @@ -0,0 +1,42 @@ +package: + name: shaderc + version: 2024.1 + epoch: 0 + description: Collection of tools, libraries, and tests for Vulkan shader compilation + copyright: + - license: Apache-2.0 + +environment: + contents: + packages: + - build-base + - busybox + - ca-certificates-bundle + - python3 + +pipeline: + - uses: git-checkout + with: + repository: https://github.com/google/shaderc + tag: v${{package.version}} + expected-commit: 47a9387ef5b3600d30d84c71ec77a59dc7db46fa + + - runs: | + ./utils/git-sync-deps # TODO: remove thirdparty dependencies and use the system ones + + - uses: cmake/configure + with: + opts: | + -DCMAKE_BUILD_TYPE=Release \ + -DSHADERC_SKIP_TESTS=ON \ + + - uses: cmake/build + + - uses: cmake/install + +update: + enabled: true + github: + identifier: google/shaderc + use-tag: true + strip-prefix: v diff --git a/unifdef.yaml b/unifdef.yaml new file mode 100644 index 0000000000..851713c430 --- /dev/null +++ b/unifdef.yaml @@ -0,0 +1,29 @@ +package: + name: unifdef + version: 2.12 + epoch: 0 + description: Selectively remove C preprocessor conditionals + copyright: + - license: BSD-2-Clause AND BSD-3-Clause + +environment: + contents: + packages: + - build-base + - busybox + - ca-certificates-bundle + +pipeline: + - uses: fetch + with: + uri: https://dotat.at/prog/unifdef/unifdef-${{package.version}}.tar.gz + expected-sha256: fba564a24db7b97ebe9329713ac970627b902e5e9e8b14e19e024eb6e278d10b + + - runs: | + make + make DESTDIR="${{targets.destdir}}" prefix=/usr install + +update: + enabled: true + release-monitor: + identifier: 5046 From 6d03593af3861ec7284d0ccbaf1d65f0c585e8c1 Mon Sep 17 00:00:00 2001 From: debasishbsws Date: Mon, 12 Aug 2024 08:37:01 +0000 Subject: [PATCH 4/6] feat(new package): Added new package GTK-4 need to enable update Signed-off-by: debasishbsws --- gtk-4.yaml | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 gtk-4.yaml diff --git a/gtk-4.yaml b/gtk-4.yaml new file mode 100644 index 0000000000..21295df02f --- /dev/null +++ b/gtk-4.yaml @@ -0,0 +1,149 @@ +package: + name: gtk-4 + version: 4.15.5 + epoch: 0 + description: The GTK+ Toolkit (v4) + copyright: + - license: LGPL-2.1-or-later + +environment: + contents: + packages: + - at-spi2-core-dev + - autoconf + - automake + - build-base + - busybox + - ca-certificates-bundle + - cairo-dev + - cmake + - cups-dev + - dbus-dev + - expat-dev + - fontconfig-dev + - fribidi-dev + - gdk-pixbuf-dev + - gettext-dev + - gi-docgen + - git + - glib-dev + - glib-gir + - gobject-introspection-dev + - graphene-dev + - gst-plugins-bad-dev + - gst-plugins-base-dev + - gstreamer-dev + - gtk-doc + - harfbuzz-dev + - hicolor-icon-theme + - iso-codes-dev + - libatk-bridge-2.0 + - libdrm-dev + - libepoxy-dev + - libice-dev + - libtool + - libx11-dev + - libxcomposite-dev + - libxcursor-dev + - libxdamage-dev + - libxext-dev + - libxfixes-dev + - libxft-dev + - libxi-dev + - libxinerama-dev + - libxkbcommon + - libxkbcommon-dev + - libxrandr-dev + - libxtst-dev + - mesa-dev + - meson + - ninja + - orc-compiler + - orc-dev + - pango-dev + - py3-docutils + - py3-gi-docgen + - py3-packaging + - sassc + - shaderc + - shared-mime-info + - smartypants + - spirv-headers + # TODO: right now shaderc also inclused spirv-tools, causin a conflict need to fix that, + # so we can use our own spirv-tools along with shaderc + # - spirv-tools + # - spirv-tools-dev + - tiff-dev + - vulkan-headers + - vulkan-loader + - wayland-dev + - wayland-protocols + - zlib-dev + +pipeline: + - uses: git-checkout + with: + repository: https://gitlab.gnome.org/GNOME/gtk.git + tag: ${{package.version}} + expected-commit: 07658347a91866f009379e6d8bcc7d1b7a653f8d + + - uses: meson/configure + with: + opts: | + -Ddocumentation=true \ + -Dintrospection=enabled \ + -Dbroadway-backend=true \ + -Dman-pages=true \ + -Dbuild-tests=false \ + -Dbuild-testsuite=false \ + -Dbuild-examples=false \ + -Dbuild-demos=false \ + -Dwin32-backend=false \ + -Dmacos-backend=false \ + + - uses: meson/compile + + - uses: meson/install + + - runs: | + # We've had trouble with this build accidentally including pango. This should be fixed, + # but throw in a test here in case. + if [ -f ${{targets.destdir}}/usr/lib/libpango-1.0.so ]; then + echo "ERROR: libpango-1.0.so found in /usr/lib. This is a bug in the build system." + exit 1 + fi + + - uses: strip + +subpackages: + - name: ${{package.name}}-dev + pipeline: + - uses: split/dev + dependencies: + runtime: + - shared-mime-info + - at-spi2-core-dev + - gdk-pixbuf-dev + - glib-dev + - libepoxy-dev + - libxext-dev + - libxi-dev + - libxinerama-dev + - libxkbcommon-dev + - wayland-dev + - shaderc + description: ${{package.name}} dev + + - name: ${{package.name}}-doc + pipeline: + - uses: split/manpages + description: ${{package.name}} manpages + + - name: ${{package.name}}-lang + pipeline: + - uses: split/locales + description: ${{package.name}} locales + +update: + enabled: false + exclude-reason: "TODO: enable update, Hosted on GitLab, can't find a release monitor for it yet. Waiting for GitLab support" From 7d3200f373962cea8d11b464136118f08f17d0ab Mon Sep 17 00:00:00 2001 From: debasishbsws Date: Mon, 12 Aug 2024 08:47:52 +0000 Subject: [PATCH 5/6] update the update config for sassc and shaderc Signed-off-by: debasishbsws --- sassc.yaml | 4 ++-- shaderc.yaml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sassc.yaml b/sassc.yaml index 907d2a0f24..d348ed4108 100644 --- a/sassc.yaml +++ b/sassc.yaml @@ -1,6 +1,6 @@ package: name: sassc - version: "3.6.2" + version: "3.6.6" epoch: 0 description: Libsass command line driver copyright: @@ -41,4 +41,4 @@ pipeline: update: enabled: true github: - identifier: sass/libsass + identifier: sass/sassc diff --git a/shaderc.yaml b/shaderc.yaml index 496ff35883..cc4cda4a08 100644 --- a/shaderc.yaml +++ b/shaderc.yaml @@ -38,5 +38,4 @@ update: enabled: true github: identifier: google/shaderc - use-tag: true strip-prefix: v From 010ae9762ba383830dadab45af898c35e577f599 Mon Sep 17 00:00:00 2001 From: Debasish Biswas Date: Mon, 12 Aug 2024 14:36:40 +0530 Subject: [PATCH 6/6] Update sassc.yaml use proper latest version. by mistake in the last commit I update the version to a non existing one Signed-off-by: Debasish Biswas --- sassc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sassc.yaml b/sassc.yaml index d348ed4108..dcf9c72f5f 100644 --- a/sassc.yaml +++ b/sassc.yaml @@ -1,6 +1,6 @@ package: name: sassc - version: "3.6.6" + version: "3.6.2" epoch: 0 description: Libsass command line driver copyright: