Skip to content

Commit

Permalink
Update to latest gtk-osx modulesets-stable and patches
Browse files Browse the repository at this point in the history
  • Loading branch information
@techee
techee committed Oct 18, 2023
1 parent 0412d06 commit 8e93515
Show file tree
Hide file tree
Showing 36 changed files with 1,180 additions and 1,492 deletions.
77 changes: 39 additions & 38 deletions modulesets-stable/bootstrap.modules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
<autotools id="xz"
autogen-sh="configure"
bootstrap="true">
<branch module="xz/xz-5.2.5.tar.bz2"
version="5.2.5"
hash="sha256:5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df"
<branch module="xz/xz-5.4.3.tar.bz2"
version="5.4.3"
hash="sha256:9243a04598d7a70c1f567a0143a255581ac5c64b140fd55fd5cbc1e00b0e6f90"
repo="tukaani.org" />
</autotools>
<!--
Expand All @@ -47,20 +47,32 @@
autogen-sh="configure"
autogenargs="--disable-dependency-tracking"
bootstrap="true">
<branch module="make/make-4.3.tar.gz"
version="4.3"
hash="sha256:e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19"
<branch module="make/make-4.4.tar.gz"
version="4.4"
hash="sha256:581f4d4e872da74b3941c874215898a7d35802f03732bdccee1d4a7979105d18"
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"
repo="ftp.gnu.org" />
</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.21.tar.xz"
version="0.21"
hash="sha256:d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192"
<branch module="gettext/gettext-0.22.3.tar.xz"
version="0.22.3"
hash="sha256:b838228b3f8823a6c1eddf07297197c4db13f7e1b173b9ef93f3f945a63080b6"
repo="ftp.gnu.org" />
<dependencies>
<dep package="libiconv" />
</dependencies>
</autotools>
<!--
cmakes ./configure is picky about invalid flags so we manually set it
Expand All @@ -69,8 +81,9 @@
autogen-sh="bootstrap"
autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s"
bootstrap="true">
<branch module="v3.25/cmake-3.25.1.tar.gz"
version="3.25.1"
<branch module="v3.26/cmake-3.26.4.tar.gz"
version="3.26.4"
hash="sha256:313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208"
repo="cmake" />
</autotools>
<!--
Expand All @@ -80,13 +93,10 @@
<autotools id="m4"
autogen-sh="configure"
bootstrap="true">
<branch module="m4/m4-1.4.18.tar.xz"
version="1.4.18"
hash="sha256:f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07"
repo="ftp.gnu.org">
<patch file="vasnprintf.patch"
strip="1" />
</branch>
<branch module="m4/m4-1.4.19.tar.xz"
version="1.4.19"
hash="sha256:63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96"
repo="ftp.gnu.org" />
</autotools>
<!---->
<autotools id="autoconf"
Expand All @@ -105,18 +115,18 @@
<autotools id="autoconf-archive"
autogen-sh="configure"
bootstrap="true">
<branch module="autoconf-archive/autoconf-archive-2021.02.19.tar.xz"
version="2021-02-19"
hash="sha256:e8a6eb9d28ddcba8ffef3fa211653239e9bf239aba6a01a6b7cfc7ceaec69cbd"
<branch module="autoconf-archive/autoconf-archive-2023.02.20.tar.xz"
version="2023-02-20"
hash="sha256:71d4048479ae28f1f5794619c3d72df9c01df49b1c628ef85fde37596dc31a33"
repo="ftp.gnu.org" />
</autotools>
<!---->
<autotools id="libtool"
autogen-sh="configure"
bootstrap="true">
<branch module="libtool/libtool-2.4.6.tar.gz"
version="2.4.6"
hash="sha256:e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3"
<branch module="libtool/libtool-2.4.7.tar.gz"
version="2.4.7"
hash="sha256:04e96c2404ea70c590c546eba4202a4e12722c640016c12b9b2f1ce3d481e9a8"
repo="ftp.gnu.org">
<patch file="libtool-apple-sort.patch"
strip="1" />
Expand All @@ -126,9 +136,9 @@
<autotools id="automake"
autogen-sh="configure"
bootstrap="true">
<branch module="automake/automake-1.16.3.tar.xz"
version="1.16.3"
hash="sha256:ff2bf7656c4d1c6fdda3b8bebb21f09153a736bcba169aaf65eab25fa113bf3a"
<branch module="automake/automake-1.16.5.tar.xz"
version="1.16.5"
hash="sha256:f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469"
repo="ftp.gnu.org" />
<dependencies>
<dep package="autoconf" />
Expand All @@ -150,9 +160,8 @@
-->
<autotools id="bison"
autogen-sh="configure">
<branch module="bison/bison-3.7.6.tar.xz"
version="3.7.6"
hash="sha256:67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf"
<branch module="bison/bison-3.8.2.tar.xz"
version="3.8.2"
repo="ftp.gnu.org" />
<dependencies>
<dep package='flex' />
Expand Down Expand Up @@ -191,19 +200,11 @@
version="0.51.0"
hash="sha256:67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
repo="intltool" />
<!--
<dependencies>
<dep package="perl-xml-parser"/>
</dependencies>
-->
</autotools>
<!---->
<metamodule id="meta-bootstrap">
<dependencies>
<dep package="xz" />
<!--
Needed for 64-bit
-->
<dep package="gettext" />
<dep package="cmake" />
<dep package="autoconf-archive" />
Expand Down
56 changes: 6 additions & 50 deletions modulesets-stable/gtk-osx-bootstrap.modules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
<autotools id="libpng"
autogen-sh="configure"
autogenargs="--enable-shared">
<branch module="libpng/libpng-1.6.39.tar.xz"
version="1.6.39"
hash="sha256:1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937"
<branch module="libpng/libpng-1.6.40.tar.xz"
version="1.6.40"
hash="sha256:535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1"
repo="sourceforge" />
<dependencies>
<dep package="zlib" />
Expand All @@ -56,9 +56,9 @@
<autotools id="libtiff"
autogen-sh="configure"
autogenargs="--without-x">
<branch module="libtiff/tiff-4.5.0.tar.gz"
version="4.5.0"
hash="sha256:c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464"
<branch module="libtiff/tiff-4.5.1.tar.xz"
version="4.5.1"
hash="sha256:3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a"
repo="libtiff">
<patch file="tiff-nohtml.patch"
strip="1" />
Expand All @@ -68,61 +68,17 @@
</dependencies>
</autotools>
<!---->
<autotools id="libxml2"
autogen-sh="autoreconf"
autogenargs='--libdir="$JHBUILD_LIBDIR" --with-python'>

<branch module="libxml2/2.10/libxml2-2.10.3.tar.xz"
version="2.10.3"
hash="sha256:5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c">
<patch file="libxml2-python-config.patch"
strip="1" />
</branch>
<after>
<dep package="python3" />
</after>
</autotools>
<!---->
<autotools id="libxslt"
autogen-sh="configure">
<branch module="libxslt/1.1/libxslt-1.1.37.tar.xz"
version="1.1.37"
hash="sha256:3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4">
<patch file="libxslt-python-config.patch"
strip="1" />
</branch>
<dependencies>
<dep package="libxml2" />
</dependencies>
</autotools>
<!---->
<meson id="gtk-doc"
mesonargs="-Dyelp_manual=false -Dtests=false">
<branch module="gtk-doc/1.33/gtk-doc-1.33.2.tar.xz"
version="1.33.2"
hash="sha256:cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43" />
<dependencies>
<dep package="libxml2" />
<dep package="libxslt" />
</dependencies>
<after>
<dep package="python3" />
<dep package="pygments" />
</after>
</meson>
<!---->
<autotools id="icu"
autogen-sh="source/configure"
autogenargs="--enable-rpath"
makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>

<branch module="unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz"
version="68.2"
hash="sha256:c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625"
checkoutdir="icu"
repo="github-tarball" />
</autotools>
<!---->
<metamodule id="meta-gtk-osx-bootstrap">
<dependencies>
<dep package="libpng" />
Expand Down
51 changes: 27 additions & 24 deletions modulesets-stable/gtk-osx-gstreamer.modules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
<meson id="liborc"
mesonargs="-Dgtk_doc=disabled -Dbenchmarks=disabled -Dexamples=disabled -Dtests=disabled">

<branch module="orc/orc-0.4.33.tar.xz"
version="0.4.33"
hash="sha256:844e6d7db8086f793f57618d3d4b68d29d99b16034e71430df3c21cfd3c3542a" />
<branch module="orc/orc-0.4.34.tar.xz"
version="0.4.34"
hash="sha256:8f47abb3f097171e44eb807adcdabd860fba2effd37d8d3c4fbd5f341cadd41f" />
</meson>
<!---->
<autotools id="faad2"
Expand All @@ -44,7 +44,10 @@
<branch module="2.16.01/nasm-2.16.01.tar.xz"
version="2.16.01"
hash="sha256:c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558"
repo="nasm" />
repo="nasm">
<patch file="nasm-2.16.01-warnings.c-needs-srcdir-patch"
strip="1" />
</branch>
</autotools>
<!---->
<autotools id="ffmpeg"
Expand All @@ -62,9 +65,9 @@
</autotools>
<!---->
<meson id="gstreamer">
<branch module="gstreamer/gstreamer-1.22.0.tar.xz"
version="1.22.0"
hash="sha256:78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09">
<branch module="gstreamer/gstreamer-1.22.5.tar.xz"
version="1.22.5"
hash="sha256:4408d7930f381809e85917acc19712f173261ba85bdf20c5567b2a21b1193b61">
</branch>
<after>
<dep package="glib" />
Expand All @@ -73,41 +76,40 @@
<!---->
<meson id="gst-plugins-base"
mesonargs="-Dexamples=disabled -Ddoc=disabled">
<branch module="gst-plugins-base/gst-plugins-base-1.22.0.tar.xz"
version="1.22.0"
hash="sha256:f53672294f3985d56355c8b1df8f6b49c8c8721106563e19f53be3507ff2229d" />
<branch module="gst-plugins-base/gst-plugins-base-1.22.5.tar.xz"
version="1.22.5"
hash="sha256:edd4338b45c26a9af28c0d35aab964a024c3884ba6f520d8428df04212c8c93a" />
<dependencies>
<dep package="gstreamer" />
<dep package="liborc" />
</dependencies>
<after></after>
</meson>
<!---->
<meson id="gst-plugins-good">
<branch module="gst-plugins-good/gst-plugins-good-1.22.0.tar.xz"
version="1.22.0"
hash="sha256:582e617271e7f314d1a2211e3e3856ae2e4303c8c0d6114e9c4a5ea5719294b0">
<branch module="gst-plugins-good/gst-plugins-good-1.22.5.tar.xz"
version="1.22.5"
hash="sha256:b67b31313a54c6929b82969d41d3cfdf2f58db573fb5f491e6bba5d84aea0778">
</branch>
<dependencies>
<dep package="gstreamer" />
<dep package="gst-plugins-base" />
</dependencies>
</meson>
<!---->
<meson id="gst-plugins-ugly">
<branch module="gst-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz"
version="1.22.0"
hash="sha256:a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c" />
<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" />
<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.0.tar.xz"
version="1.22.0"
hash="sha256:3c9d9300f5f4fb3e3d36009379d1fb6d9ecd79c1a135df742b8a68417dd663a1" />
<branch module="gst-plugins-bad/gst-plugins-bad-1.22.5.tar.xz"
version="1.22.5"
hash="sha256:e64e75cdafd7ff2fc7fc34e855b06b1e3ed227cc06fa378d17bbcd76780c338c" />
<dependencies>
<dep package="gstreamer" />
<dep package="gst-plugins-base" />
Expand All @@ -117,9 +119,10 @@
</meson>
<!---->
<meson id="gst-libav">
<branch module="gst-libav/gst-libav-1.22.0.tar.xz"
version="1.22.0"
hash="sha256:0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1" />
<branch module="gst-libav/gst-libav-1.22.5.tar.xz"
version="1.22.5"
hash="sha256:8583f0c1f4fcb01eed11fa1e3c21126543a8bd739ed4fc1db31f756a5ab01d9a">
</branch>
<dependencies>
<dep package="gstreamer" />
<dep package="gst-plugins-base" />
Expand Down

0 comments on commit 8e93515

Please sign in to comment.