Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update modulesets. #25

Merged
merged 3 commits into from
Aug 5, 2024
Merged

Update modulesets. #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31e99fe
Update to macos-12 runner.
auouymous Jun 22, 2024
b9aeb15
Bash now requires './' to source from a relative path.
auouymous Jul 29, 2024
14e462a
Update modulesets.
auouymous Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
github.event_name == 'push' ||
github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name

runs-on: macos-11
runs-on: macos-12
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion fetch_modules.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

source pins.sh
source ./pins.sh

git clone https://gitlab.gnome.org/GNOME/gtk-osx.git _gtk-osx-modules
(cd _gtk-osx-modules && git checkout $PIN_GTK_OSX_COMMIT)
Expand Down
70 changes: 46 additions & 24 deletions modulesets/bootstrap.modules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<repository name="ftp.gnu.org"
href="https://ftp.gnu.org/gnu/"
type="tarball" />
<repository name="pkgconfig"
href="http://pkgconfig.freedesktop.org/releases/"
<repository name="pkgconf"
href="https://distfiles.ariadne.space/pkgconf/"
type="tarball" />
<repository name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"
Expand All @@ -35,9 +35,9 @@
<autotools id="xz"
autogen-sh="configure"
bootstrap="true">
<branch module="xz/xz-5.4.3.tar.bz2"
version="5.4.3"
hash="sha256:9243a04598d7a70c1f567a0143a255581ac5c64b140fd55fd5cbc1e00b0e6f90"
<branch module="xz/xz-5.6.2.tar.bz2"
version="5.6.2"
hash="sha256:e12aa03cbd200597bd4ce11d97be2d09a6e6d39a9311ce72c91ac7deacde3171"
repo="tukaani.org" />
</autotools>
<!--
Expand All @@ -53,14 +53,34 @@
repo="ftp.gnu.org" />
</autotools>
<!---->
<autotools id="libiconv"
autogen-sh="configure"
autogenargs="--disable-debug --disable-dependency-tracking --enable-extra-encodings">

<branch module="libiconv/libiconv-1.17.tar.gz"
version="1.17"
hash="sha256:8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313"
repo="ftp.gnu.org" />
<!---->
</autotools>
<autotools id="libunistring" autogen-sh="configure">
<branch repo="ftp.gnu.org" module="libunistring/libunistring-1.2.tar.gz"
version="1.2">
</branch>
</autotools>
<!---->
<autotools id="gettext"
autogen-sh="configure"
autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp --with-included-glib --with-included-libcroco">

<branch module="gettext/gettext-0.22.tar.xz"
version="0.22"
hash="sha256:0e60393a47061567b46875b249b7d2788b092d6457d656145bb0e7e6a3e26d93"
<branch module="gettext/gettext-0.22.5.tar.xz"
version="0.22.5"
hash="sha256:fe10c37353213d78a5b83d48af231e005c4da84db5ce88037d88355938259640"
repo="ftp.gnu.org" />
<dependencies>
<dep package="libiconv" />
<dep package="libunistring" />
</dependencies>
</autotools>
<!--
cmakes ./configure is picky about invalid flags so we manually set it
Expand All @@ -69,9 +89,9 @@
autogen-sh="bootstrap"
autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s"
bootstrap="true">
<branch module="v3.26/cmake-3.26.4.tar.gz"
version="3.26.4"
hash="sha256:313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208"
<branch module="v3.29/cmake-3.29.3.tar.gz"
version="3.29.3"
hash="sha256:252aee1448d49caa04954fd5e27d189dd51570557313e7b281636716a238bccb"
repo="cmake" />
</autotools>
<!--
Expand All @@ -90,9 +110,9 @@
<autotools id="autoconf"
autogen-sh="configure"
bootstrap="true">
<branch module="autoconf/autoconf-2.71.tar.xz"
version="2.71"
hash="shas56:f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4"
<branch module="autoconf/autoconf-2.72.tar.xz"
version="2.72"
hash="sha256:ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a"
repo="ftp.gnu.org" />
<dependencies>
<dep package="m4" />
Expand Down Expand Up @@ -133,15 +153,15 @@
</dependencies>
</autotools>
<!---->
<autotools id="pkg-config"
autogen-sh="configure"
autogenargs="--with-internal-glib"
bootstrap="true">
<branch module="pkg-config-0.29.2.tar.gz"
version="0.29.2"
hash="sha256:6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591"
repo="pkgconfig" />
</autotools>
<meson id="pkgconf"
mesonargs="-Dwith-system-libdir=/usr/lib -Dwith-system-includedir=/usr/include" >
<branch module="pkgconf-2.2.0.tar.xz"
version="2.2.0"
hash="sha256:b06ff63a83536aa8c2f6422fa80ad45e4833f590266feb14eaddfe1d4c853c69"
repo="pkgconf" >
<patch file="pkgconf-link-pkg-config.patch" strip="1" />
</branch>
</meson>
<!--
macOS provides 2.3 (presumably the last GPL2 version, gstreamer
requires 2.4.
Expand All @@ -150,6 +170,7 @@
autogen-sh="configure">
<branch module="bison/bison-3.8.2.tar.xz"
version="3.8.2"
hash="sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2"
repo="ftp.gnu.org" />
<dependencies>
<dep package='flex' />
Expand Down Expand Up @@ -193,12 +214,13 @@
<metamodule id="meta-bootstrap">
<dependencies>
<dep package="xz" />
<dep package="libiconv"/>
<dep package="gettext" />
<dep package="cmake" />
<dep package="autoconf-archive" />
<dep package="libtool" />
<dep package="automake" />
<dep package="pkg-config" />
<dep package="pkgconf" />
<dep package="bison" />
<dep package="flex" />
<dep package="gtk-osx-docbook" />
Expand Down
38 changes: 24 additions & 14 deletions modulesets/gtk-osx-bootstrap.modules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
<repository name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"
type="tarball" />
<repository name="jpeg"
href="http://www.ijg.org/files/"
type="tarball" />
<repository name="libtiff"
href="http://download.osgeo.org/"
type="tarball" />
Expand All @@ -32,33 +29,46 @@
<repository name="github-tarball"
href="https://github.com/"
type="tarball" />
<repository name="nasm"
href="https://www.nasm.us/pub/nasm/releasebuilds/"
type="tarball" />
<!---->
<autotools id="libpng"
autogen-sh="configure"
autogenargs="--enable-shared">
<branch module="libpng/libpng-1.6.40.tar.xz"
version="1.6.40"
hash="sha256:535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1"
<branch module="libpng/libpng-1.6.43.tar.xz"
version="1.6.43"
hash="sha256:6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c"
repo="sourceforge" />
<dependencies>
<dep package="zlib" />
</dependencies>
</autotools>
<!---->
<autotools id="libjpeg"
<autotools id="nasm"
autogen-sh="configure">
<branch module="jpegsrc.v9e.tar.gz"
version="9e"
checkoutdir="jpeg-9e"
repo="jpeg" />
<branch module="2.16.03/nasm-2.16.03.tar.xz"
version="2.16.03"
hash="sha256:1412a1c760bbd05db026b6c0d1657affd6631cd0a63cddb6f73cc6d4aa616148"
repo="nasm">
</branch>
</autotools>
<!---->
<cmake id="libjpeg" cmakeargs="-DCMAKE_MACOSX_RPATH=true -DCMAKE_INSTALL_PREFIX:PATH=${JHBUILD_PREFIX} -DCMAKE_INSTALL_NAME_DIR=${JHBUILD_PREFIX}/lib -DCMAKE_INSTALL_LIBDIR:PATH=lib">
<branch module="libjpeg-turbo/libjpeg-turbo/releases/download/3.0.3/libjpeg-turbo-3.0.3.tar.gz" version="3.0.3"
hash="sha256:343e789069fc7afbcdfe44dbba7dbbf45afa98a15150e079a38e60e44578865d"
repo="github-tarball" checkoutdir="libjpeg-turbo-3.0.3" />
<dependencies>
<dep package="nasm" />
</dependencies>
</cmake>
<!---->
<autotools id="libtiff"
autogen-sh="configure"
autogenargs="--without-x">
<branch module="libtiff/tiff-4.5.1.tar.xz"
version="4.5.1"
hash="sha256:3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a"
<branch module="libtiff/tiff-4.6.0.tar.xz"
version="4.6.0"
hash="sha256:e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2"
repo="libtiff">
<patch file="tiff-nohtml.patch"
strip="1" />
Expand Down
86 changes: 42 additions & 44 deletions modulesets/gtk-osx-gstreamer.modules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,63 +11,49 @@
default="yes"
href="http://gstreamer.freedesktop.org/src/"
type="tarball" />
<repository name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"
<repository name="github.com"
href="https://github.com/"
type="tarball" />
<repository name="ffmpeg"
href="https://ffmpeg.org/releases/"
type="tarball" />
<repository name="nasm"
href="https://www.nasm.us/pub/nasm/releasebuilds/"
type="tarball" />
<!---->
<meson id="liborc"
mesonargs="-Dgtk_doc=disabled -Dbenchmarks=disabled -Dexamples=disabled -Dtests=disabled">

<branch module="orc/orc-0.4.34.tar.xz"
version="0.4.34"
hash="sha256:8f47abb3f097171e44eb807adcdabd860fba2effd37d8d3c4fbd5f341cadd41f" />
<branch module="orc/orc-0.4.38.tar.xz"
version="0.4.38"
hash="sha256:a55a98d4772567aa3faed8fb84d540c3db77eaba16d3e2e10b044fbc9228668d" />
</meson>
<!---->
<autotools id="faad2"
autogen-sh="autoreconf"
autogenargs="-without-bmp --without-xmms --without-drm --without-mpeg4ip">

<branch module="faac/faad2-src/faad2-2.8.0/faad2-2.8.6.tar.gz"
version="2.8.6"
hash="sha256:654977adbf62eb81f4fca00152aca58ce3b6dd157181b9edd7bed687a7c73f21"
repo="sourceforge" />
</autotools>
<!---->
<autotools id="nasm"
autogen-sh="configure">
<branch module="2.16.01/nasm-2.16.01.tar.xz"
version="2.16.01"
hash="sha256:c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558"
repo="nasm">
<patch file="nasm-2.16.01-warnings.c-needs-srcdir-patch"
strip="1" />
</branch>
<branch module="knik0/faad2/archive/refs/tags/2.11.0.tar.gz"
version="2.11.0"
hash="sha256:720c1dc404439e0a9117aa144dc7ead56f1658adf4badbb39f959d6ad8eed489"
repo="github.com" />
</autotools>
<!---->
<autotools id="ffmpeg"
autogen-sh="configure"
autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s"
autogenargs="--enable-gpl --enable-version3 --enable-shared --disable-static --disable-runtime-cpudetect --disable-programs --disable-ffplay --disable-ffprobe --disable-doc">

<branch module="ffmpeg-4.3.2.tar.xz"
version="4.3.2"
hash="sha256:46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb"
<branch module="ffmpeg-7.0.tar.xz"
version="7.0"
hash="sha256:4426a94dd2c814945456600c8adfc402bee65ec14a70e8c531ec9a2cd651da7b"
repo="ffmpeg" />
<dependencies>
<dep package="nasm" />
</dependencies>
</autotools>
<!---->
<meson id="gstreamer">
<branch module="gstreamer/gstreamer-1.22.5.tar.xz"
version="1.22.5"
hash="sha256:4408d7930f381809e85917acc19712f173261ba85bdf20c5567b2a21b1193b61">
<branch module="gstreamer/gstreamer-1.24.4.tar.xz"
version="1.24.4"
hash="sha256:52c93bc48e03533aa676fd8c15eb6b5fc326c68db311c50bcc0a865f31a6c653">
</branch>
<after>
<dep package="glib" />
Expand All @@ -76,19 +62,19 @@
<!---->
<meson id="gst-plugins-base"
mesonargs="-Dexamples=disabled -Ddoc=disabled">
<branch module="gst-plugins-base/gst-plugins-base-1.22.5.tar.xz"
version="1.22.5"
hash="sha256:edd4338b45c26a9af28c0d35aab964a024c3884ba6f520d8428df04212c8c93a" />
<branch module="gst-plugins-base/gst-plugins-base-1.24.4.tar.xz"
version="1.24.4"
hash="sha256:09f4ddf246eeb819da1494ce336316edbbcb28fdff3ee2f9804891e84df39b2a" />
<dependencies>
<dep package="gstreamer" />
<dep package="liborc" />
</dependencies>
</meson>
<!---->
<meson id="gst-plugins-good">
<branch module="gst-plugins-good/gst-plugins-good-1.22.5.tar.xz"
version="1.22.5"
hash="sha256:b67b31313a54c6929b82969d41d3cfdf2f58db573fb5f491e6bba5d84aea0778">
<branch module="gst-plugins-good/gst-plugins-good-1.24.4.tar.xz"
version="1.24.4"
hash="sha256:023096d661cf58cde3e0dcdbf56897bf588830232358c305f3e15fd63e116626">
</branch>
<dependencies>
<dep package="gstreamer" />
Expand All @@ -97,19 +83,19 @@
</meson>
<!---->
<meson id="gst-plugins-ugly" mesonargs="-Dgpl=enabled">
<branch module="gst-plugins-ugly/gst-plugins-ugly-1.22.5.tar.xz"
version="1.22.5"
hash="sha256:2680473b218158f18467cac3e1c50291b7ff4e0710dd350a59eaacbc29c09a54" />
<branch module="gst-plugins-ugly/gst-plugins-ugly-1.24.4.tar.xz"
version="1.24.4"
hash="sha256:4604f8709c0bc4d6960ef6ae6fd91e0b20af011bfe22e103f5b85377cf3f1ef4" />
<dependencies>
<dep package="gstreamer" />
<dep package="gst-plugins-base" />
</dependencies>
</meson>
<!---->
<meson id="gst-plugins-bad">
<branch module="gst-plugins-bad/gst-plugins-bad-1.22.5.tar.xz"
version="1.22.5"
hash="sha256:e64e75cdafd7ff2fc7fc34e855b06b1e3ed227cc06fa378d17bbcd76780c338c" />
<branch module="gst-plugins-bad/gst-plugins-bad-1.24.4.tar.xz"
version="1.24.4"
hash="sha256:260bd0a463b4faff9a42f41e5e028f787f10a92b779af8959aec64586f546bd3" />
<dependencies>
<dep package="gstreamer" />
<dep package="gst-plugins-base" />
Expand All @@ -119,9 +105,9 @@
</meson>
<!---->
<meson id="gst-libav">
<branch module="gst-libav/gst-libav-1.22.5.tar.xz"
version="1.22.5"
hash="sha256:8583f0c1f4fcb01eed11fa1e3c21126543a8bd739ed4fc1db31f756a5ab01d9a">
<branch module="gst-libav/gst-libav-1.24.4.tar.xz"
version="1.24.4"
hash="sha256:4d3803f36008e847fc4842c8dd366162baf8359526cc46c1851bf68bb638da73">
</branch>
<dependencies>
<dep package="gstreamer" />
Expand All @@ -130,6 +116,17 @@
</dependencies>
</meson>
<!---->
<meson id="gst-python">
<branch module="gst-python/gst-python-1.24.4.tar.xz"
version="1.24.4"
hash="sha256:5510358316eb5c965829a393714b4d88306033cd64db3eae8cc62b41ae80a392">
</branch>
<dependencies>
<dep package="gstreamer" />
<dep package="gst-plugins-base" />
</dependencies>
</meson>
<!---->
<metamodule id="meta-gtk-osx-gstreamer">
<dependencies>
<dep package="gstreamer" />
Expand All @@ -138,6 +135,7 @@
<dep package="gst-plugins-ugly" />
<dep package="gst-plugins-bad" />
<dep package="gst-libav" />
<dep package="gst-python" />
</dependencies>
</metamodule>
<!---->
Expand Down
Loading