August 2021 - CRUX - lists.crux.nu

ports/contrib (3.6): [notify] libreoffice: 7.2.0.1 -> 7.2.0.3; dropped dependency on libcmis, openldap now optional
by crux＠crux.nu 15 Aug '21

15 Aug '21

commit 6f0ee2cb5d6f2234884ee3d181c016deb5836e36 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Aug 15 21:59:52 2021 +0200 [notify] libreoffice: 7.2.0.1 -> 7.2.0.3; dropped dependency on libcmis, openldap now optional diff --git a/libreoffice/.footprint b/libreoffice/.footprint index c58a6171e..bf5ec773b 100644 --- a/libreoffice/.footprint +++ b/libreoffice/.footprint @@ -328,7 +328,6 @@ lrwxrwxrwx root/root usr/lib/libreoffice/program/bootstraprc -> ../../../etc/lib -rwxr-xr-x root/root usr/lib/libreoffice/program/libinvocadaptlo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libinvocationlo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libiolo.so --rwxr-xr-x root/root usr/lib/libreoffice/program/libldapbe2lo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/liblibreofficekitgtk.so -rwxr-xr-x root/root usr/lib/libreoffice/program/liblnglo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/liblnthlo.so @@ -420,7 +419,6 @@ lrwxrwxrwx root/root usr/lib/libreoffice/program/bootstraprc -> ../../../etc/lib -rwxr-xr-x root/root usr/lib/libreoffice/program/libucb1.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libucbhelper.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libucpchelp1.so --rwxr-xr-x root/root usr/lib/libreoffice/program/libucpcmis1lo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libucpdav1.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libucpexpand1lo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libucpextlo.so diff --git a/libreoffice/.signature b/libreoffice/.signature index 0914ff873..e73b19324 100644 --- a/libreoffice/.signature +++ b/libreoffice/.signature @@ -1,9 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31qmJzsdHtay9Z/bLfZLNaY57wYBuS6DQkq5rCJ5phmz9V51x9CtYmlnDDKNoNirzYVVZRbTPVp6t7qjynoRAQk= -SHA256 (Pkgfile) = 032aeef8d58b80dd72f77a35367492a3c5c84cf3313d0b6f56c9ad57025a4122 -SHA256 (.footprint) = 903550ff96f2fec3be9c37f4b3e3238cf0719b2234c3b8f37ced03931795499c -SHA256 (libreoffice-7.2.0.1.tar.xz) = 218c22ac991ac2ac071ef26c2dc3b4a0153d49d2f8ca97cee836e5ffe92f7396 -SHA256 (libreoffice-dictionaries-7.2.0.1.tar.xz) = f50cd9ef0e2a534645eb9c214c509b1546e04e8918f939a3923250e25abba617 +RWSagIOpLGJF3xPreFm5QnBJhfcYWKI2RnS/bCAX+b/5qmq2xVDcGL8GFuUlbtTOLAOmFtVsdQpzXzjOgKGZ1C1D8MhWaQ/95QU= +SHA256 (Pkgfile) = 43ece7fc3029ac42ffa1034e5e8aef701503097e71a3cc956ef02e2daf4b2d56 +SHA256 (.footprint) = e723234350c195c0f15a287b1bb4343483bde67a3718f3771235dfac9bf380a8 +SHA256 (libreoffice-7.2.0.3.tar.xz) = 2c17b6bfe0a8bfc92002f713cf095bc865ebfae7d8f66f989484fcc460ed9648 +SHA256 (libreoffice-dictionaries-7.2.0.3.tar.xz) = 3a1caf6a741c9cc476493a8a75ee6d6f67c396cb80457cfd03a53c603433280b SHA256 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA256 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 SHA256 (dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile index 2ea055eda..e4ee14770 100644 --- a/libreoffice/Pkgfile +++ b/libreoffice/Pkgfile @@ -1,11 +1,11 @@ # Description: LibreOffice is a powerful office suite # URL: https://www.libreoffice.org/ # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: box2d clucene coin-or-mp fakeroot fontforge gpgme graphite2 gst-plugins-base hyphen libabw libcdr libcmis libe-book libepubgen libetonyek libexttextcat libfreehand libmspub libmwaw libmythes libnumbertext libodfgen liborcus libpagemaker libpaper libqrcodegen libqxp libstaroffice libtommath libvisio libwpg libwps libzmf lpsolve mariadb neon openjpeg2 python3-lxml redland sane unzip xmlsec zip xorg-libxcomposite -# Optional: cups kio qt5 valgrind +# Depends on: box2d clucene coin-or-mp fakeroot fontforge gpgme graphite2 gst-plugins-base hyphen libabw libcdr libe-book libepubgen libetonyek libexttextcat libfreehand libmspub libmwaw libmythes libnumbertext libodfgen liborcus libpagemaker libpaper libqrcodegen libqxp libstaroffice libtommath libvisio libwpg libwps libzmf lpsolve mariadb neon openjpeg2 python3-lxml redland sane unzip xmlsec zip xorg-libxcomposite +# Optional: cups kio openldap qt5 valgrind name=libreoffice -version=7.2.0.1 +version=7.2.0.3 release=1 pdfiumversion=4500 source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$ver… @@ -15,8 +15,10 @@ source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$ver… https://dev-www.libreoffice.org/src/dtoa-20180411.tgz #https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz https://dev-www.libreoffice.org/src/pdfium-$pdfiumversion.tar.bz2 + #https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz makefile.in.patch pdfium-use-system-libopenjpeg.diff) +# unpack_source() {{{ unpack_source() { mkdir $SRC/tarballs for file in ${source[@]}; do @@ -28,6 +30,7 @@ unpack_source() { pdfium-$pdfiumversion.tar.bz2|\ dtoa-20180411.tgz|\ skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz|\ + libcmis-0.5.2.tar.xz|\ 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) echo "Moving $(get_filename $file) to $SRC/tarballs" cp $(get_filename $file) $SRC/tarballs ;; @@ -36,11 +39,13 @@ unpack_source() { esac done } +# }}} build() { - # fail the build if dependencies are not met + # fail the build if dependencies are not met {{{ ls /usr/include/harfbuzz/hb-icu.h || (printf '\e[1;31m%-6s\e[m\n' "you need to install icu, then rebuild harfbuzz for libreoffice to work, quitting.." ; exit 1) ls /usr/lib/pkgconfig/xmlsec1-nss.pc || (printf '\e[1;31m%-6s\e[m\n' "you need to install nss, then rebuild xmlsec for libreoffice to work, quitting.." ; exit 1) + # }}} cd $name-$version @@ -48,11 +53,13 @@ build() { # https://sources.debian.org/patches/libreoffice/1:7.1.4%7Erc1-1/pdfium-use-s… patch -Np1 -i $SRC/pdfium-use-system-libopenjpeg.diff - # determine configure options based on installed packages on the system - [[ -e /usr/lib/cups ]] && PKGMK_LIBREOFFICE+=" --enable-cups" || PKGMK_LIBREOFFICE+=" --disable-cups" - [[ -e /usr/lib/pkgconfig/Qt5Core.pc ]] && PKGMK_LIBREOFFICE+=" --enable-qt5" || PKGMK_LIBREOFFICE+=" --disable-qt5" - [[ -e /usr/include/KF5/KIOCore ]] && PKGMK_LIBREOFFICE+=" --enable-kde5 --enable-gtk3-kde5" - [[ -e /usr/lib/pkgconfig/valgrind.pc ]] && PKGMK_LIBREOFFICE+=" --with-valgrind" + # optionals {{{ + prt-get isinst cups && PKGMK_LIBREOFFICE+=" --enable-cups" || PKGMK_LIBREOFFICE+=" --disable-cups" + prt-get isinst kio && PKGMK_LIBREOFFICE+=" --enable-kde5 --enable-gtk3-kde5" + prt-get isinst openldap || PKGMK_LIBREOFFICE+=' --disable-ldap' + prt-get isinst qt5 && PKGMK_LIBREOFFICE+=" --enable-qt5" || PKGMK_LIBREOFFICE+=" --disable-qt5" + prt-get isinst valgrind && PKGMK_LIBREOFFICE+=" --with-valgrind" + # }}} local build_date=$(date +%Y%m%d) ./autogen.sh $PKGMK_LIBREOFFICE \ @@ -68,8 +75,8 @@ build() { --with-external-hyph-dir=/usr/share/hypen \ --with-external-thes-dir=/usr/share/mythes \ --without-{doxygen,fonts,gssapi,help,helppack-integration,java,system-firebird} \ - --disable-{avahi,ccache,dconf,dependency-tracking,extension-update,fetch-external} \ - --disable-{firebird-sdbc,poppler,postgresql-sdbc,report-builder,sdremote-bluetooth,skia,werror,zxing} + --disable-{avahi,ccache,cmis,dconf,dependency-tracking,extension-update,fetch-external,firebird-sdbc} \ + --disable-{poppler,postgresql-sdbc,report-builder,sdremote-bluetooth,skia,werror,zxing} touch {sources.ver,src.downloaded} echo "lo_sources_ver=${version}" > sources.ver @@ -91,9 +98,10 @@ build() { cd $PKG/usr/lib/libreoffice/program/ ln -vsrf $PKG/usr/etc/libreoffice/{bootstraprc,sofficerc} . - # cleanup + # cleanup {{{ rm -r $PKG/usr/share/libreoffice/sdk rm -r $PKG/usr/lib/libreoffice/sdk rm -r $PKG/usr/share/doc find $PKG -iname "*readme*" -exec rm -fr '{}' \+ + # }}} }

1 0

ports/contrib (3.6): [notify] openjdk11-jdk: removed obsolete dependencies, added missing harfbuzz
by crux＠crux.nu 15 Aug '21

15 Aug '21

commit 40ecae38c28a70fa8d82c84d165497c237e7d675 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Aug 15 17:17:41 2021 +0200 [notify] openjdk11-jdk: removed obsolete dependencies, added missing harfbuzz diff --git a/openjdk11-jdk/.signature b/openjdk11-jdk/.signature index 9289f2d81..cb882c7dd 100644 --- a/openjdk11-jdk/.signature +++ b/openjdk11-jdk/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF330DmDBu1fPzwfCikPGDkbFt6Zjw/b52SAE/khJjvt5gAttQDzLu1Cop6KNyglDoE5qgJ+d/PRno28RVaIH6nw0= -SHA256 (Pkgfile) = 1acfc718344a7701ad890a493ee7523c43ef0bfbdc6093994fc0ce841d7abe01 +RWSagIOpLGJF34PBh0W4nubb6+w3JbB8C/D8pbkuxV1JbsMoR+4ojNY9XHwnswTsFOva0NCvfhdfFtBDeRvUMfhjH/mIEoGhjAQ= +SHA256 (Pkgfile) = 3ad13eb78dfddba462e584f95c00e7674963acc0407c425f98f8e04114dc99a3 SHA256 (.footprint) = 03377f0471c2680d08f519ce02e0b2f9e6e3c34c4cd8fa7c695029043ca80666 SHA256 (jdk-11.0.12+7.tar.bz2) = 03531735116e74644b729fc0b8663ed72f7c83ebe093c02f1887be89264d8b92 SHA256 (openjdk11-boot-20210620.tar.xz) = 03a0f8cb544282c589bd8e701311841a68558b93ea36cebf76e1f21c444e204b diff --git a/openjdk11-jdk/Pkgfile b/openjdk11-jdk/Pkgfile index 5e49db2c8..04d9ce32e 100644 --- a/openjdk11-jdk/Pkgfile +++ b/openjdk11-jdk/Pkgfile @@ -2,13 +2,13 @@ # URL: https://openjdk.java.net/ # Maintainer: Tim Biermann, tbier at posteo dot de # Co-Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: alsa-lib cups fontconfig giflib krb5 lcms2 libxslt nss unzip xorg-libxrandr xorg-libxt xorg-libxtst zip +# Depends on: alsa-lib cups giflib harfbuzz lcms2 libxslt nss unzip xorg-libxrandr xorg-libxt xorg-libxtst zip name=openjdk11-jdk version=11.0.12+7 _boot_ver=20210620 _cert_ver=20210620 -release=1 +release=2 source=(http://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-$version.… https://crux.ster.zone/downloads/java/openjdk11-boot-$_boot_ver.tar.xz https://crux.ster.zone/downloads/java/java_cacerts-${_cert_ver})

1 0

ports/contrib (3.6): [notify] davfs2: removed obsolete dependencies
by crux＠crux.nu 15 Aug '21

15 Aug '21

commit cf2c335914d38661dabf0f16a644beeb56d6774a Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Aug 15 16:48:28 2021 +0200 [notify] davfs2: removed obsolete dependencies diff --git a/davfs2/.signature b/davfs2/.signature index 8e8f59b44..3056f63c4 100644 --- a/davfs2/.signature +++ b/davfs2/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37hjjD+lxDVAeB5Yr4kUxlb3PnrTo2hkrhaWhlwS3j0D+chNl2lLkneu1njJTHuJ5GnYy2toNGbDZt05dkqsmAc= -SHA256 (Pkgfile) = 907c1dfede58010e958c828ccfd6fb4a91258ba6e76249825fd1370360b82bf7 +RWSagIOpLGJF33R3dyQa6jEQ/Luk3sPpwurG6SoXiXrcOaxdY5DdidHlJMlg4xDLne+48lcgQA5+faW3Yy7E3r5F1a429/XkCAQ= +SHA256 (Pkgfile) = 629bb718cee3b8e1e38ea88fb7120e71511810f81a12c68c41abd772e4c96dad SHA256 (.footprint) = e5fe013a18c9862c62f0bdd5d93b944ba45786f1b2e12317e92e02550ef75106 SHA256 (davfs2-1.6.0.tar.gz) = 2e6b675685bd917772be60f0999ae098c80f79ff20dc131e8fec4547cbb63b50 diff --git a/davfs2/Pkgfile b/davfs2/Pkgfile index 18b1de5c0..785daa12b 100644 --- a/davfs2/Pkgfile +++ b/davfs2/Pkgfile @@ -1,7 +1,7 @@ # Description: File system driver that allows you to mount a WebDAV folder # URL: http://savannah.nongnu.org/projects/davfs2 # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: expat keyutils krb5 neon +# Depends on: neon name=davfs2 version=1.6.0 @@ -10,13 +10,15 @@ source=(http://mirror.easyname.at/nongnu/$name/$name-$version.tar.gz) build() { cd $name-$version - dav_user=nobody \ - dav_group=network + dav_user=nobody dav_group=network + # allow neon version 31 sed -i 's/29 30/29 30 31/g' configure + ./configure --prefix=/usr \ - --disable-debug + --disable-debug make make DESTDIR=$PKG install + rm -r $PKG/usr/share/{doc,locale} }

1 0

ports/contrib (3.6): [notify] openjdk16-jdk: removed obsolete dependencies
by crux＠crux.nu 15 Aug '21

15 Aug '21

commit 6d9f64d7bac3931655019af89822e3b68516ce9d Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Aug 15 16:47:54 2021 +0200 [notify] openjdk16-jdk: removed obsolete dependencies diff --git a/openjdk16-jdk/.signature b/openjdk16-jdk/.signature index 1bc9d2e05..3383bd5be 100644 --- a/openjdk16-jdk/.signature +++ b/openjdk16-jdk/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF322SBOBJA5L6PTWQzmiZ0gzuw/sOscYTRdyTiqoWL+fP+OzuquHYV2KhEFtexjvPcEYKmYM+A1ImdhrSpWUwsgs= -SHA256 (Pkgfile) = 3bf507e19c419758d1636c775b7436808f6acf717c4d5898304ec366ce875704 +RWSagIOpLGJF3ygfXZWrleQ8BviO4ZjQDNaROpFNrLGwEBUsVmzFNvw1sMF5su+SnYXsVyqtjFPal8edIZJ8O35v88PfCHStwQo= +SHA256 (Pkgfile) = ec5e086f3598b02ccc873c175c7ff0d0bc8c14624686086723128ff262f01413 SHA256 (.footprint) = 6267d3d2dfb0b5c556655ed535a5231e8ba0a553c36ae4e5a93accf1a764b2a9 SHA256 (openjdk16-jdk-16.0.1+9.tar.gz) = 3b3aca61fe2834322e51636d99bcd09c4abba7d8a2cde231dbcbcbdedf829baf SHA256 (openjdk16-boot-20210620.tar.xz) = 2434966d83e170bf7abb39e90242401b42221e7e6a1a3c589337712e18d9050f diff --git a/openjdk16-jdk/Pkgfile b/openjdk16-jdk/Pkgfile index eb37cb7ca..ba1ae0406 100644 --- a/openjdk16-jdk/Pkgfile +++ b/openjdk16-jdk/Pkgfile @@ -2,13 +2,13 @@ # URL: https://openjdk.java.net/ # Maintainer: Tim Biermann, tbier at posteo dot de # Co-Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: alsa-lib cups fontconfig giflib krb5 lcms2 libxslt nss unzip xorg-libxrandr xorg-libxt xorg-libxtst zip +# Depends on: alsa-lib cups fontconfig giflib lcms2 libxslt nss unzip xorg-libxrandr xorg-libxt xorg-libxtst zip name=openjdk16-jdk version=16.0.1+9 _boot_ver=20210620 _cert_ver=20210620 -release=1 +release=2 source=(https://github.com/openjdk/jdk16u/archive/jdk-$version/$name-$versi… https://crux.ster.zone/downloads/java/openjdk16-boot-$_boot_ver.tar.xz https://crux.ster.zone/downloads/java/java_cacerts-${_cert_ver})

1 0

ports/contrib (3.6): [notify] libmediainfo: removed obsolete dependencies
by crux＠crux.nu 15 Aug '21

15 Aug '21

commit 81d62fdbaf09a06effc0718066ddba66bcc004b6 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Aug 15 16:37:55 2021 +0200 [notify] libmediainfo: removed obsolete dependencies diff --git a/libmediainfo/.signature b/libmediainfo/.signature index b295ec573..ab18914b8 100644 --- a/libmediainfo/.signature +++ b/libmediainfo/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zHg6j8v34oiW1wbeXcXdbeXD3bFAbjm99mCDSeUtXGmbaaMrcs6D3LISk6YmTteyF9QlWbYKp2kx0sc3ZfrOQ4= -SHA256 (Pkgfile) = c3531c6deddfc2954372d71e4d1b7838fc17f0eff27bcecb3f9820faa8295f59 +RWSagIOpLGJF31BCEksTNWWTT0VocSRipbGyKEwVrKvEJHTXE2aLNhHIqaAq03eEdB0K/wiFhatlBa2ZbEpy0vGd2pyQE2ZfMwo= +SHA256 (Pkgfile) = 76af897a94318b11365d502ece432ffb509c2264bed633747a713aaf12a34369 SHA256 (.footprint) = 73cdfd6e9d921638301ec8125028af8c82b07bea78298e90ecd66352b5f6c54d SHA256 (libmediainfo_21.03.tar.xz) = 56b7e9abf80cba48032165cd7a46fd8d43dd63e3af35765f66c3f134caaca4ca diff --git a/libmediainfo/Pkgfile b/libmediainfo/Pkgfile index c391dc6fe..02752df41 100644 --- a/libmediainfo/Pkgfile +++ b/libmediainfo/Pkgfile @@ -1,7 +1,7 @@ # Description: MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files # URL: https://mediaarea.net/en/MediaInfo # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: brotli e2fsprogs keyutils libmms libpsl libzen openldap rtmpdump +# Depends on: libzen tinyxml name=libmediainfo version=21.03

1 0

ports/contrib (3.6): [notify] yubico-pam: removed obsolete dependencies
by crux＠crux.nu 15 Aug '21

15 Aug '21

commit 41e8eac82edd51f3820b35f7e4b87b1fb65516ff Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Aug 15 16:35:33 2021 +0200 [notify] yubico-pam: removed obsolete dependencies diff --git a/yubico-pam/.footprint b/yubico-pam/.footprint index 8aaf54e1f..f4ef6b493 100644 --- a/yubico-pam/.footprint +++ b/yubico-pam/.footprint @@ -5,9 +5,3 @@ drwxr-xr-x root/root lib/security/ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/ykpamcfg -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man1/ --rw-r--r-- root/root usr/share/man/man1/ykpamcfg.1.gz -drwxr-xr-x root/root usr/share/man/man8/ --rw-r--r-- root/root usr/share/man/man8/pam_yubico.8.gz diff --git a/yubico-pam/.signature b/yubico-pam/.signature index bad598319..1b1aa9426 100644 --- a/yubico-pam/.signature +++ b/yubico-pam/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF310vAzhz4kJrNt8GJMxhnZsthVeNr8znwjCoi+Oee8osw2FIuv8KMAVqClvXiRuIDoa4bad4+zjZAi11Gtw4swA= -SHA256 (Pkgfile) = e0b8d6cae5a4197c040a7a4537a5878dfded1bf7f57856d55c1455193d711237 -SHA256 (.footprint) = c70062ef917bcc3bffeee3bcf9c3be84bbce30b133c599193a662c5eb6697cf6 +RWSagIOpLGJF3yQe6p1pc9VwYjy4wWmp1dIEO38jj859/Zmzp+FqXYHd1qCqfF7WCd/um6NGyNPYC9Xc2jJt6HycMHT39LPMoAg= +SHA256 (Pkgfile) = 96e1d5460e82f8a33470630dc4899390ff12aaecacec77eb15be8404f28d4ca2 +SHA256 (.footprint) = 03c767880ad6a8ea314cc2bd3fdfda4c5e9b9a4751079655daaf5f6e3a690540 SHA256 (yubico-pam-2.27.tar.gz) = 04f5a3698c877bd36391ef052c2975ff86e5655610b82276b307146c17787b1d diff --git a/yubico-pam/Pkgfile b/yubico-pam/Pkgfile index d87fa801e..3176a3d73 100644 --- a/yubico-pam/Pkgfile +++ b/yubico-pam/Pkgfile @@ -1,17 +1,22 @@ # Description: Yubico Pluggable Authentication Module (PAM) # URL: https://github.com/Yubico/yubico-pam # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: linux-pam json-c openldap yubikey-personalization +# Depends on: linux-pam json-c yubikey-personalization +# Optional: asciidoc openldap name=yubico-pam version=2.27 -release=1 +release=2 source=(https://github.com/Yubico/yubico-pam/archive/$version/$name-$versio… build() { cd $name-$version + + prt-get isinst asciidoc || PKGMK_YUBICOPAM+=' --disable-documentation' + prt-get isinst openldap || PKGMK_YUBICOPAM+=' --without-ldap' + autoreconf -fi - ./configure --prefix=/usr \ + ./configure --prefix=/usr $PKGMK_YUBICOPAM \ --with-pam-dir=/lib/security \ --disable-static make

1 0

ports/contrib (3.6): [notify] raptor: removed obsolete dependencies
by crux＠crux.nu 15 Aug '21

15 Aug '21

commit 44ea09b0419c7cb2b70af4d5672180f7ee10492c Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Aug 15 16:30:46 2021 +0200 [notify] raptor: removed obsolete dependencies diff --git a/raptor/.signature b/raptor/.signature index bfe96bdc2..943a1dd67 100644 --- a/raptor/.signature +++ b/raptor/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF34QioeDNFQLwhKAbqv8duUe7mw+LE7lxG/3l9wslM4BBnVNetoySSvJ6Iavwx3vvuxvFGKP27BfOv4H290mKCQE= -SHA256 (Pkgfile) = 66f2d3e2180e9866552ce25b712fa774184d0e38445617117d8056494cc895cc +RWSagIOpLGJF33SZ6VxIA0WHUBMHsvfWsGsL+jjZ+P5qL90N1XEOgzJ9eAozW7znhZ4arQ7jOFeBK/qdOKaPH+bZcetEfzk6QA0= +SHA256 (Pkgfile) = 06565b60a84c5a7658fa02b69a4e1600cb92d067c692b944124229d45aaa7d6f SHA256 (.footprint) = d17fbcd4efd58f95fa79560a96ec64dbbe01e47357edea3749b83357ad0d5c34 SHA256 (raptor2-2.0.15.tar.gz) = ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed diff --git a/raptor/Pkgfile b/raptor/Pkgfile index f5a9798d8..57434c416 100644 --- a/raptor/Pkgfile +++ b/raptor/Pkgfile @@ -1,7 +1,7 @@ # Description: A C library that parses RDF/XML/N-Triples into RDF triples # URL: http://librdf.org/raptor # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: brotli gnutls icu keyutils libpsl libxslt openldap rtmpdump +# Depends on: icu libxslt name=raptor version=2.0.15

1 0

ports/contrib (3.6): [notify] libsrtp: build now depends on meson/ninja
by crux＠crux.nu 15 Aug '21

15 Aug '21

commit a8f20d8ea0be3c6241d35463f34d0f04f0993d49 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Aug 15 16:15:30 2021 +0200 [notify] libsrtp: build now depends on meson/ninja diff --git a/libsrtp/.footprint b/libsrtp/.footprint index 8fcedf22e..2fdcd3a1c 100644 --- a/libsrtp/.footprint +++ b/libsrtp/.footprint @@ -6,6 +6,7 @@ drwxr-xr-x root/root usr/include/srtp2/ -rw-r--r-- root/root usr/include/srtp2/crypto_types.h -rw-r--r-- root/root usr/include/srtp2/srtp.h drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libsrtp2.a +lrwxrwxrwx root/root usr/lib/libsrtp2.so -> libsrtp2.so.1 +-rwxr-xr-x root/root usr/lib/libsrtp2.so.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libsrtp2.pc diff --git a/libsrtp/.signature b/libsrtp/.signature index ed3e1511c..ec89d64d1 100644 --- a/libsrtp/.signature +++ b/libsrtp/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/qb6I9fKArOW0eEtjZoGUsI6w0xTwyS3DxqK0CbvJ3ncy8vm2bGePVQ7bq/UjQsVdELF+tmeegVcBPEN+aayQ0= -SHA256 (Pkgfile) = 2e114f4ba35486a0cf5dcb26f4096b75a9941fdae272ba77215955e30c8ebe1f -SHA256 (.footprint) = 91295a1aca3241912bd2cf2fb57bdf10b3f3d53025e35c879a35d70ca34f09a3 +RWSagIOpLGJF37vH3Ol1EDAgUxTILBbNGUuJcoIea3udUwYv8xVFTe0Nc7mhR+/FN2mWD4kJl+FmMdx5gJe0zvJipLSTEeBkUQQ= +SHA256 (Pkgfile) = c765a67d36308190264b80fbb088cafef35e155af4f362b292e1ae920cdbeec3 +SHA256 (.footprint) = e5352f5862a3e8dc5a07da90d156d5d4d54345fcf06b76b25d3a3cc556da7ee8 SHA256 (libsrtp-2.4.0.tar.gz) = 713c5c1dc740707422307f39834c0b0fbb76769168d87e92c438a3cca8233d3d -SHA256 (libsrtp-2.3.0-shared-fix.patch) = d996cb9eae1f8d40b2394ebc937616470ae2d67bd075578a4d473e7c2b918358 diff --git a/libsrtp/Pkgfile b/libsrtp/Pkgfile index 4b05e2a89..1821f7445 100644 --- a/libsrtp/Pkgfile +++ b/libsrtp/Pkgfile @@ -1,20 +1,25 @@ # Description: Secure Realtime transport protocol library # URL: https://github.com/cisco/libsrtp # Maintainer: Tim Biermann, tbier at posteo dot de +# Depends on: meson ninja +# Optional: clang name=libsrtp version=2.4.0 -release=1 -source=(https://github.com/cisco/libsrtp/archive/v$version/$name-$version.tar.gz - libsrtp-2.3.0-shared-fix.patch) +release=2 +source=(https://github.com/cisco/libsrtp/archive/v$version/$name-$version.tar.gz) build() { - cd $name-$version - patch -p1 -i $SRC/libsrtp-2.3.0-shared-fix.patch - CFLAGS+=' -fcommon' \ - ./configure \ + prt-get isinst clang && PKGMK_SRTP+=' -D fuzzer=enabled' + meson setup $name-$version build $PKGMK_SRTP \ --prefix=/usr \ - --enable-openssl - make - make DESTDIR=$PKG install + --buildtype=plain \ + --wrap-mode nodownload \ + --auto-features disabled \ + -D b_lto=true \ + -D b_pie=true \ + -D crypto-library=openssl \ + -D doc=disabled + meson compile -C build + DESTDIR=$PKG meson install -C build }

1 0

ports/contrib (3.6): [notify] gst-plugins-bad: moved brotli and openldap to optional dependencies, cherrypicked two commits from upstream
by crux＠crux.nu 15 Aug '21

15 Aug '21

commit ccfa38f260be92896572da36493cd4d2116d7293 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Aug 15 16:14:31 2021 +0200 [notify] gst-plugins-bad: moved brotli and openldap to optional dependencies, cherrypicked two commits from upstream diff --git a/gst-plugins-bad/.signature b/gst-plugins-bad/.signature index ff923b018..c40ad9be3 100644 --- a/gst-plugins-bad/.signature +++ b/gst-plugins-bad/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3z19LkBdtN8NKXPTQk+P6hWGZ2dlDk2B1jKIAlL1fy8M+ccOqqlQHSkzf1I28qSYddBp+vdX+RYH9mdcK347OA4= -SHA256 (Pkgfile) = caf9d46fc09df297a1db980e6965ec1e792dc3bfab6563aa57feb82b780fe54a +RWSagIOpLGJF3/lch8P3tanZzNHboIiZmYwL5jC4OX0oRD2+EMVUvUJcFslFvFKX7vG/EGmC3Aa2n897VUkBr/p9nasvVvZ0ogc= +SHA256 (Pkgfile) = 219e21ee7ec7e130f1e94e4da79a194618fc5e317aa536206564454a14a14fa1 SHA256 (.footprint) = 8983b300aa249c458379e9824a1fd5ac91002cac8e2d57a231fc193e50790edf SHA256 (gst-plugins-bad-1.18.4.tar.xz) = 74e806bc5595b18c70e9ca93571e27e79dfb808e5d2e7967afa952b52e99c85f +SHA256 (68858358544dd3b7e20663f731db22fd74a78a45.patch) = e94417d88f4417eaed47a1d37bfca4a78610d413334c113e4b350bc8e233f7fd +SHA256 (a9fafd98b74fd184b178604095d35ac6105119b8.patch) = 84e2addc2b5cf4ee6c5c233e5a1234b8e3242292894403514f475dac13107837 diff --git a/gst-plugins-bad/68858358544dd3b7e20663f731db22fd74a78a45.patch b/gst-plugins-bad/68858358544dd3b7e20663f731db22fd74a78a45.patch new file mode 100644 index 000000000..592805229 --- /dev/null +++ b/gst-plugins-bad/68858358544dd3b7e20663f731db22fd74a78a45.patch @@ -0,0 +1,1205 @@ +From 68858358544dd3b7e20663f731db22fd74a78a45 Mon Sep 17 00:00:00 2001 +From: Matthew Waters <matthew(a)centricular.com> +Date: Mon, 22 Mar 2021 14:34:36 +1100 +Subject: [PATCH] gst: don't use volatile to mean atomic + +volatile is not sufficient to provide atomic guarantees and real atomics +should be used instead. GCC 11 has started warning about using volatile +with atomic operations. + +https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719 + +Discovered in https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/868 + +Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2…> +--- + ext/colormanagement/gstlcms.c | 4 ++-- + ext/curl/gstcurlqueue.h | 2 +- + ext/iqa/iqa.c | 2 +- + ext/opencv/gstcvdilateerode.cpp | 2 +- + ext/openjpeg/gstopenjpegenc.c | 2 +- + ext/resindvd/rsndec.c | 2 +- + ext/sctp/sctpassociation.c | 2 +- + ext/ttml/subtitlemeta.c | 2 +- + ext/wildmidi/gstwildmididec.c | 2 +- + gst-libs/gst/adaptivedemux/gstadaptivedemux.c | 6 +++--- + gst-libs/gst/audio/gstnonstreamaudiodecoder.c | 2 +- + gst-libs/gst/codecparsers/gstmpegvideometa.c | 2 +- + gst-libs/gst/sctp/sctpreceivemeta.c | 2 +- + gst-libs/gst/sctp/sctpsendmeta.c | 2 +- + gst-libs/gst/vulkan/android/gstvkwindow_android.c | 2 +- + gst-libs/gst/vulkan/cocoa/gstvkwindow_cocoa.m | 2 +- + gst-libs/gst/vulkan/gstvkbuffermemory.c | 2 +- + gst-libs/gst/vulkan/gstvkcommandbuffer.c | 2 +- + gst-libs/gst/vulkan/gstvkdescriptorset.c | 2 +- + gst-libs/gst/vulkan/gstvkdevice.c | 2 +- + gst-libs/gst/vulkan/gstvkdisplay.c | 2 +- + gst-libs/gst/vulkan/gstvkfence.c | 2 +- + gst-libs/gst/vulkan/gstvkhandle.c | 2 +- + gst-libs/gst/vulkan/gstvkimagememory.c | 2 +- + gst-libs/gst/vulkan/gstvkimageview.c | 2 +- + gst-libs/gst/vulkan/gstvkinstance.c | 2 +- + gst-libs/gst/vulkan/gstvkmemory.c | 2 +- + gst-libs/gst/vulkan/gstvkphysicaldevice.c | 2 +- + gst-libs/gst/vulkan/gstvkqueue.c | 2 +- + gst-libs/gst/vulkan/gstvktrash.c | 2 +- + gst-libs/gst/vulkan/gstvkutils.c | 2 +- + gst-libs/gst/vulkan/gstvkwindow.c | 2 +- + gst-libs/gst/vulkan/ios/gstvkwindow_ios.m | 2 +- + gst-libs/gst/vulkan/vulkan_mkenum.py | 4 ++-- + gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.c | 2 +- + gst-libs/gst/vulkan/xcb/gstvkwindow_xcb.c | 2 +- + gst/camerabin2/gstcamerabin2.c | 2 +- + gst/debugutils/gstfakevideosink.c | 2 +- + gst/mxf/mxfmetadata.c | 2 +- + gst/netsim/gstnetsim.c | 8 ++++---- + gst/rtmp2/rtmp/amf.c | 2 +- + gst/rtmp2/rtmp/rtmpchunkstream.c | 2 +- + gst/rtmp2/rtmp/rtmpclient.c | 8 ++++---- + gst/rtmp2/rtmp/rtmphandshake.c | 2 +- + gst/rtmp2/rtmp/rtmpmessage.c | 2 +- + gst/segmentclip/gstsegmentclip.c | 2 +- + sys/androidmedia/gstamcaudiodec.c | 2 +- + sys/androidmedia/gstamcvideodec.c | 2 +- + sys/androidmedia/gstamcvideoenc.c | 2 +- + sys/applemedia/coremediabuffer.c | 2 +- + sys/applemedia/corevideobuffer.c | 2 +- + sys/applemedia/corevideomemory.c | 2 +- + sys/applemedia/iosglmemory.c | 2 +- + sys/applemedia/iosurfaceglmemory.c | 2 +- + sys/applemedia/iosurfacevulkanmemory.c | 2 +- + sys/bluez/gstavdtpsrc.h | 2 +- + sys/d3d11/gstd3d11decoder.c | 2 +- + sys/d3d11/gstd3d11device.c | 4 ++-- + sys/d3d11/gstd3d11shader.c | 2 +- + sys/d3d11/gstd3d11utils.c | 2 +- + sys/d3d11/gstd3d11videoprocessor.c | 4 ++-- + sys/d3d11/gstd3d11window.cpp | 2 +- + sys/d3d11/gstd3d11window_win32.cpp | 2 +- + sys/ipcpipeline/gstipcpipelinecomm.c | 2 +- + sys/msdk/gstmsdkcontextutil.c | 2 +- + sys/nvcodec/gstcudacontext.c | 2 +- + sys/nvcodec/gstcudautils.c | 4 ++-- + sys/nvcodec/gstnvbaseenc.h | 2 +- + sys/opensles/openslescommon.c | 4 ++-- + sys/va/gstvaallocator.c | 6 +++--- + sys/va/gstvautils.c | 2 +- + sys/wasapi/gstwasapiutil.c | 2 +- + sys/wasapi2/gstwasapi2client.cpp | 2 +- + sys/winscreencap/dxgicapture.c | 2 +- + tests/check/libs/vkimage.c | 4 ++-- + 75 files changed, 92 insertions(+), 92 deletions(-) + +diff --git a/ext/colormanagement/gstlcms.c b/ext/colormanagement/gstlcms.c +index ebcc4438b8..84f694bf09 100644 +--- a/ext/colormanagement/gstlcms.c ++++ b/ext/colormanagement/gstlcms.c +@@ -67,7 +67,7 @@ enum + GType + gst_lcms_intent_get_type (void) + { +- static volatile gsize intent_type = 0; ++ static gsize intent_type = 0; + static const GEnumValue intent[] = { + {GST_LCMS_INTENT_PERCEPTUAL, "Perceptual", + "perceptual"}, +@@ -90,7 +90,7 @@ gst_lcms_intent_get_type (void) + static GType + gst_lcms_lookup_method_get_type (void) + { +- static volatile gsize lookup_method_type = 0; ++ static gsize lookup_method_type = 0; + static const GEnumValue lookup_method[] = { + {GST_LCMS_LOOKUP_METHOD_UNCACHED, + "Uncached, calculate every pixel on the fly (very slow playback)", +diff --git a/ext/curl/gstcurlqueue.h b/ext/curl/gstcurlqueue.h +index e43359a585..eea1d9610b 100644 +--- a/ext/curl/gstcurlqueue.h ++++ b/ext/curl/gstcurlqueue.h +@@ -51,7 +51,7 @@ + struct _GstCurlHttpSrcQueueElement + { + GstCurlHttpSrc *p; +- volatile gint running; ++ gint running; + GstCurlHttpSrcQueueElement *next; + }; + +diff --git a/ext/iqa/iqa.c b/ext/iqa/iqa.c +index c27bcd9f51..7cc45b88c5 100644 +--- a/ext/iqa/iqa.c ++++ b/ext/iqa/iqa.c +@@ -159,7 +159,7 @@ gst_iqa_mode_flags_get_type (void) + {GST_IQA_MODE_STRICT, "Strict comparison of frames.", "strict"}, + {0, NULL, NULL} + }; +- static volatile GType id = 0; ++ static GType id = 0; + + if (g_once_init_enter ((gsize *) & id)) { + GType _id; +diff --git a/ext/opencv/gstcvdilateerode.cpp b/ext/opencv/gstcvdilateerode.cpp +index 77a7ec4599..ad4d2ad887 100644 +--- a/ext/opencv/gstcvdilateerode.cpp ++++ b/ext/opencv/gstcvdilateerode.cpp +@@ -87,7 +87,7 @@ static void gst_cv_dilate_erode_get_property (GObject * object, guint prop_id, + GType + gst_cv_dilate_erode_get_type (void) + { +- static volatile gsize opencv_dilate_erode_type = 0; ++ static gsize opencv_dilate_erode_type = 0; + + if (g_once_init_enter (&opencv_dilate_erode_type)) { + GType _type; +diff --git a/ext/openjpeg/gstopenjpegenc.c b/ext/openjpeg/gstopenjpegenc.c +index 307d753d09..df12ea1b2e 100644 +--- a/ext/openjpeg/gstopenjpegenc.c ++++ b/ext/openjpeg/gstopenjpegenc.c +@@ -44,7 +44,7 @@ gst_openjpeg_enc_progression_order_get_type (void) + {OPJ_CPRL, "CPRL", "crpl"}, + {0, NULL, NULL} + }; +- static volatile GType id = 0; ++ static GType id = 0; + + if (g_once_init_enter ((gsize *) & id)) { + GType _id; +diff --git a/ext/resindvd/rsndec.c b/ext/resindvd/rsndec.c +index 4f4b2680f5..bb747757fe 100644 +--- a/ext/resindvd/rsndec.c ++++ b/ext/resindvd/rsndec.c +@@ -346,7 +346,7 @@ rsn_dec_change_state (GstElement * element, GstStateChange transition) + GType + rsn_dec_get_type (void) + { +- static volatile gsize type = 0; ++ static gsize type = 0; + + if (g_once_init_enter (&type)) { + GType _type; +diff --git a/ext/sctp/sctpassociation.c b/ext/sctp/sctpassociation.c +index dd98eb1766..fbf5b4afef 100644 +--- a/ext/sctp/sctpassociation.c ++++ b/ext/sctp/sctpassociation.c +@@ -56,7 +56,7 @@ gst_sctp_association_state_get_type (void) + {GST_SCTP_ASSOCIATION_STATE_ERROR, "state-error", "state-error"}, + {0, NULL, NULL} + }; +- static volatile GType id = 0; ++ static GType id = 0; + + if (g_once_init_enter ((gsize *) & id)) { + GType _id; +diff --git a/ext/ttml/subtitlemeta.c b/ext/ttml/subtitlemeta.c +index cdbfcce243..3ce569f6e8 100644 +--- a/ext/ttml/subtitlemeta.c ++++ b/ext/ttml/subtitlemeta.c +@@ -32,7 +32,7 @@ + GType + gst_subtitle_meta_api_get_type (void) + { +- static volatile GType type; ++ static GType type; + static const gchar *tags[] = { "memory", NULL }; + + if (g_once_init_enter (&type)) { +diff --git a/ext/wildmidi/gstwildmididec.c b/ext/wildmidi/gstwildmididec.c +index d628c0fe6c..b90488bd22 100644 +--- a/ext/wildmidi/gstwildmididec.c ++++ b/ext/wildmidi/gstwildmididec.c +@@ -151,7 +151,7 @@ static void gst_wildmidi_dec_update_options (GstWildmidiDec * wildmidi_dec); + + static GMutex load_mutex; + static unsigned long init_refcount = 0; +-static volatile gint wildmidi_initialized = 0; ++static gint wildmidi_initialized = 0; + + + static gchar * +diff --git a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c +index e32444eaa7..a495ec2e7a 100644 +--- a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c ++++ b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c +@@ -211,7 +211,7 @@ struct _GstAdaptiveDemuxPrivate + + typedef struct _GstAdaptiveDemuxTimer + { +- volatile gint ref_count; ++ gint ref_count; + GCond *cond; + GMutex *mutex; + GstClockID clock_id; +@@ -312,7 +312,7 @@ gst_adaptive_demux_requires_periodical_playlist_update_default (GstAdaptiveDemux + GType + gst_adaptive_demux_get_type (void) + { +- static volatile gsize type = 0; ++ static gsize type = 0; + + if (g_once_init_enter (&type)) { + GType _type; +@@ -4577,7 +4577,7 @@ gst_adaptive_demux_timer_new (GCond * cond, GMutex * mutex) + timer->fired = FALSE; + timer->cond = cond; + timer->mutex = mutex; +- timer->ref_count = 1; ++ g_atomic_int_set (&timer->ref_count, 1); + return timer; + } + +diff --git a/gst-libs/gst/audio/gstnonstreamaudiodecoder.c b/gst-libs/gst/audio/gstnonstreamaudiodecoder.c +index ca8afce6aa..f98ddb014d 100644 +--- a/gst-libs/gst/audio/gstnonstreamaudiodecoder.c ++++ b/gst-libs/gst/audio/gstnonstreamaudiodecoder.c +@@ -339,7 +339,7 @@ gst_nonstream_audio_decoder_subsong_mode_get_type (void) + GType + gst_nonstream_audio_decoder_get_type (void) + { +- static volatile gsize nonstream_audio_decoder_type = 0; ++ static gsize nonstream_audio_decoder_type = 0; + + if (g_once_init_enter (&nonstream_audio_decoder_type)) { + GType type_; +diff --git a/gst-libs/gst/codecparsers/gstmpegvideometa.c b/gst-libs/gst/codecparsers/gstmpegvideometa.c +index 4b9a71bacb..bce5c67d69 100644 +--- a/gst-libs/gst/codecparsers/gstmpegvideometa.c ++++ b/gst-libs/gst/codecparsers/gstmpegvideometa.c +@@ -96,7 +96,7 @@ gst_mpeg_video_meta_transform (GstBuffer * dest, GstMeta * meta, + GType + gst_mpeg_video_meta_api_get_type (void) + { +- static volatile GType type; ++ static GType type; + static const gchar *tags[] = { "memory", NULL }; /* don't know what to set here */ + + if (g_once_init_enter (&type)) { +diff --git a/gst-libs/gst/sctp/sctpreceivemeta.c b/gst-libs/gst/sctp/sctpreceivemeta.c +index e1c77d4660..11def65238 100644 +--- a/gst-libs/gst/sctp/sctpreceivemeta.c ++++ b/gst-libs/gst/sctp/sctpreceivemeta.c +@@ -37,7 +37,7 @@ GType + gst_sctp_receive_meta_api_get_type (void) + { + static const gchar *tags[] = { NULL }; +- static volatile GType type; ++ static GType type; + if (g_once_init_enter (&type)) { + GType _type = gst_meta_api_type_register ("GstSctpReceiveMetaAPI", tags); + g_once_init_leave (&type, _type); +diff --git a/gst-libs/gst/sctp/sctpsendmeta.c b/gst-libs/gst/sctp/sctpsendmeta.c +index d8ce14fc93..e29cd7d927 100644 +--- a/gst-libs/gst/sctp/sctpsendmeta.c ++++ b/gst-libs/gst/sctp/sctpsendmeta.c +@@ -37,7 +37,7 @@ GType + gst_sctp_send_meta_api_get_type (void) + { + static const gchar *tags[] = { NULL }; +- static volatile GType type; ++ static GType type; + if (g_once_init_enter (&type)) { + GType _type = gst_meta_api_type_register ("GstSctpSendMetaAPI", tags); + g_once_init_leave (&type, _type); +diff --git a/gst-libs/gst/vulkan/android/gstvkwindow_android.c b/gst-libs/gst/vulkan/android/gstvkwindow_android.c +index c1bd866acd..a745d54cea 100644 +--- a/gst-libs/gst/vulkan/android/gstvkwindow_android.c ++++ b/gst-libs/gst/vulkan/android/gstvkwindow_android.c +@@ -37,7 +37,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); + static void + _init_debug (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkanwindowandroid", 0, +diff --git a/gst-libs/gst/vulkan/cocoa/gstvkwindow_cocoa.m b/gst-libs/gst/vulkan/cocoa/gstvkwindow_cocoa.m +index f007262671..fd8e22742e 100644 +--- a/gst-libs/gst/vulkan/cocoa/gstvkwindow_cocoa.m ++++ b/gst-libs/gst/vulkan/cocoa/gstvkwindow_cocoa.m +@@ -42,7 +42,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); + static void + _init_debug (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkanwindowmacos", 0, +diff --git a/gst-libs/gst/vulkan/gstvkbuffermemory.c b/gst-libs/gst/vulkan/gstvkbuffermemory.c +index 967ef9d27d..515aff0d0c 100644 +--- a/gst-libs/gst/vulkan/gstvkbuffermemory.c ++++ b/gst-libs/gst/vulkan/gstvkbuffermemory.c +@@ -363,7 +363,7 @@ gst_vulkan_buffer_memory_allocator_init (GstVulkanBufferMemoryAllocator * + void + gst_vulkan_buffer_memory_init_once (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_VULKAN_BUFFER_MEMORY, "vulkanbuffermemory", +diff --git a/gst-libs/gst/vulkan/gstvkcommandbuffer.c b/gst-libs/gst/vulkan/gstvkcommandbuffer.c +index 2719ba3e37..7b0d310da0 100644 +--- a/gst-libs/gst/vulkan/gstvkcommandbuffer.c ++++ b/gst-libs/gst/vulkan/gstvkcommandbuffer.c +@@ -41,7 +41,7 @@ GST_DEBUG_CATEGORY (GST_CAT_DEFAULT); + static void + init_debug (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkancommandbuffer", 0, +diff --git a/gst-libs/gst/vulkan/gstvkdescriptorset.c b/gst-libs/gst/vulkan/gstvkdescriptorset.c +index ad2280d20e..1718382d80 100644 +--- a/gst-libs/gst/vulkan/gstvkdescriptorset.c ++++ b/gst-libs/gst/vulkan/gstvkdescriptorset.c +@@ -44,7 +44,7 @@ GST_DEBUG_CATEGORY (GST_CAT_DEFAULT); + static void + init_debug (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkandescriptorset", 0, +diff --git a/gst-libs/gst/vulkan/gstvkdevice.c b/gst-libs/gst/vulkan/gstvkdevice.c +index e5f57d10ca..639406de0f 100644 +--- a/gst-libs/gst/vulkan/gstvkdevice.c ++++ b/gst-libs/gst/vulkan/gstvkdevice.c +@@ -67,7 +67,7 @@ struct _GstVulkanDevicePrivate + static void + _init_debug (void) + { +- static volatile gsize init; ++ static gsize init; + + if (g_once_init_enter (&init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkandevice", 0, +diff --git a/gst-libs/gst/vulkan/gstvkdisplay.c b/gst-libs/gst/vulkan/gstvkdisplay.c +index 345234985f..fc87417b66 100644 +--- a/gst-libs/gst/vulkan/gstvkdisplay.c ++++ b/gst-libs/gst/vulkan/gstvkdisplay.c +@@ -59,7 +59,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); + static void + _init_debug (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkandisplay", 0, +diff --git a/gst-libs/gst/vulkan/gstvkfence.c b/gst-libs/gst/vulkan/gstvkfence.c +index cdfcefe0ac..9e03a24b50 100644 +--- a/gst-libs/gst/vulkan/gstvkfence.c ++++ b/gst-libs/gst/vulkan/gstvkfence.c +@@ -42,7 +42,7 @@ GST_DEBUG_CATEGORY (gst_debug_vulkan_fence); + static void + _init_debug (void) + { +- static volatile gsize init; ++ static gsize init; + + if (g_once_init_enter (&init)) { + GST_DEBUG_CATEGORY_INIT (gst_debug_vulkan_fence, +diff --git a/gst-libs/gst/vulkan/gstvkhandle.c b/gst-libs/gst/vulkan/gstvkhandle.c +index 454f845465..8219030d42 100644 +--- a/gst-libs/gst/vulkan/gstvkhandle.c ++++ b/gst-libs/gst/vulkan/gstvkhandle.c +@@ -40,7 +40,7 @@ GST_DEBUG_CATEGORY (GST_CAT_DEFAULT); + static void + init_debug (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkanhandle", 0, +diff --git a/gst-libs/gst/vulkan/gstvkimagememory.c b/gst-libs/gst/vulkan/gstvkimagememory.c +index 8a0328433c..7a242496ef 100644 +--- a/gst-libs/gst/vulkan/gstvkimagememory.c ++++ b/gst-libs/gst/vulkan/gstvkimagememory.c +@@ -705,7 +705,7 @@ gst_vulkan_image_memory_allocator_init (GstVulkanImageMemoryAllocator * + void + gst_vulkan_image_memory_init_once (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_VULKAN_IMAGE_MEMORY, "vulkanimagememory", +diff --git a/gst-libs/gst/vulkan/gstvkimageview.c b/gst-libs/gst/vulkan/gstvkimageview.c +index 655a77865d..c8f86bad9e 100644 +--- a/gst-libs/gst/vulkan/gstvkimageview.c ++++ b/gst-libs/gst/vulkan/gstvkimageview.c +@@ -40,7 +40,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFUALT); + static void + init_debug (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_VULKAN_IMAGE_VIEW, "vulkanimageview", +diff --git a/gst-libs/gst/vulkan/gstvkinstance.c b/gst-libs/gst/vulkan/gstvkinstance.c +index 0dbf26f9cd..14db32922e 100644 +--- a/gst-libs/gst/vulkan/gstvkinstance.c ++++ b/gst-libs/gst/vulkan/gstvkinstance.c +@@ -96,7 +96,7 @@ struct _GstVulkanInstancePrivate + static void + _init_debug (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkaninstance", 0, +diff --git a/gst-libs/gst/vulkan/gstvkmemory.c b/gst-libs/gst/vulkan/gstvkmemory.c +index f70333258f..40ed31e8ff 100644 +--- a/gst-libs/gst/vulkan/gstvkmemory.c ++++ b/gst-libs/gst/vulkan/gstvkmemory.c +@@ -309,7 +309,7 @@ gst_vulkan_memory_allocator_init (GstVulkanMemoryAllocator * allocator) + void + gst_vulkan_memory_init_once (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_VULKAN_MEMORY, "vulkanmemory", 0, +diff --git a/gst-libs/gst/vulkan/gstvkphysicaldevice.c b/gst-libs/gst/vulkan/gstvkphysicaldevice.c +index cf9be303bb..33f9f20553 100644 +--- a/gst-libs/gst/vulkan/gstvkphysicaldevice.c ++++ b/gst-libs/gst/vulkan/gstvkphysicaldevice.c +@@ -71,7 +71,7 @@ struct _GstVulkanPhysicalDevicePrivate + static void + _init_debug (void) + { +- static volatile gsize init; ++ static gsize init; + + if (g_once_init_enter (&init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkandevice", 0, +diff --git a/gst-libs/gst/vulkan/gstvkqueue.c b/gst-libs/gst/vulkan/gstvkqueue.c +index 0763b83d6e..025b9b235b 100644 +--- a/gst-libs/gst/vulkan/gstvkqueue.c ++++ b/gst-libs/gst/vulkan/gstvkqueue.c +@@ -40,7 +40,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_CONTEXT); + static void + _init_debug (void) + { +- static volatile gsize init; ++ static gsize init; + + if (g_once_init_enter (&init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkanqueue", 0, "Vulkan Queue"); +diff --git a/gst-libs/gst/vulkan/gstvktrash.c b/gst-libs/gst/vulkan/gstvktrash.c +index 56c12bafe7..a5c38ccaa4 100644 +--- a/gst-libs/gst/vulkan/gstvktrash.c ++++ b/gst-libs/gst/vulkan/gstvktrash.c +@@ -44,7 +44,7 @@ GST_DEBUG_CATEGORY (gst_debug_vulkan_trash); + static void + _init_debug (void) + { +- static volatile gsize init; ++ static gsize init; + + if (g_once_init_enter (&init)) { + GST_DEBUG_CATEGORY_INIT (gst_debug_vulkan_trash, +diff --git a/gst-libs/gst/vulkan/gstvkutils.c b/gst-libs/gst/vulkan/gstvkutils.c +index 15af242d6c..446a3e4429 100644 +--- a/gst-libs/gst/vulkan/gstvkutils.c ++++ b/gst-libs/gst/vulkan/gstvkutils.c +@@ -37,7 +37,7 @@ static void + _init_context_debug (void) + { + #ifndef GST_DISABLE_GST_DEBUG +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_GET (GST_CAT_CONTEXT, "GST_CONTEXT"); +diff --git a/gst-libs/gst/vulkan/gstvkwindow.c b/gst-libs/gst/vulkan/gstvkwindow.c +index bcccfe5146..ed5a784c9f 100644 +--- a/gst-libs/gst/vulkan/gstvkwindow.c ++++ b/gst-libs/gst/vulkan/gstvkwindow.c +@@ -138,7 +138,7 @@ gst_vulkan_window_default_close (GstVulkanWindow * window) + static void + _init_debug (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkanwindow", 0, +diff --git a/gst-libs/gst/vulkan/ios/gstvkwindow_ios.m b/gst-libs/gst/vulkan/ios/gstvkwindow_ios.m +index 84fc33deb3..db23e77ae1 100644 +--- a/gst-libs/gst/vulkan/ios/gstvkwindow_ios.m ++++ b/gst-libs/gst/vulkan/ios/gstvkwindow_ios.m +@@ -41,7 +41,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); + static void + _init_debug (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkanwindowios", 0, +diff --git a/gst-libs/gst/vulkan/vulkan_mkenum.py b/gst-libs/gst/vulkan/vulkan_mkenum.py +index 0d1ecfe097..59a6bbc3eb 100644 +--- a/gst-libs/gst/vulkan/vulkan_mkenum.py ++++ b/gst-libs/gst/vulkan/vulkan_mkenum.py +@@ -22,11 +22,11 @@ c_array = ['--fhead', + '--fprod', + "\n/* enumerations from \"@basename@\" */", + '--vhead', +- "GType\n@enum_name@_get_type (void)\n{\n static volatile gsize g_define_type_id__volatile = 0;\n if (g_once_init_enter (&g_define_type_id__volatile)) {\n static const G@Type@Value values[] = {", ++ "GType\n@enum_name@_get_type (void)\n{\n static gsize static_g_define_type_id = 0;\n if (g_once_init_enter (&static_g_define_type_id)) {\n static const G@Type@Value values[] = {", + '--vprod', + " { C_@TYPE@ (@VALUENAME@), \"@VALUENAME@\", \"@valuenick@\" },", + '--vtail', +- " { 0, NULL, NULL }\n };\n GType g_define_type_id = g_@type@_register_static (\"@EnumName@\", values);\n g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);\n }\n return g_define_type_id__volatile;\n}\n" ++ " { 0, NULL, NULL }\n };\n GType g_define_type_id = g_@type@_register_static (\"@EnumName@\", values);\n g_once_init_leave (&static_g_define_type_id, g_define_type_id);\n }\n return static_g_define_type_id;\n}\n" + ] + + cmd = [] +diff --git a/gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.c b/gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.c +index eda063de92..5d3f5c48df 100644 +--- a/gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.c ++++ b/gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.c +@@ -37,7 +37,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); + static void + _init_debug (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkanwindowxcb", 0, +diff --git a/gst-libs/gst/vulkan/xcb/gstvkwindow_xcb.c b/gst-libs/gst/vulkan/xcb/gstvkwindow_xcb.c +index b0f1ab4d0f..285943b12e 100644 +--- a/gst-libs/gst/vulkan/xcb/gstvkwindow_xcb.c ++++ b/gst-libs/gst/vulkan/xcb/gstvkwindow_xcb.c +@@ -39,7 +39,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); + static void + _init_debug (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "vulkanwindowxcb", 0, +diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c +index 584e3e3167..502ed736da 100644 +--- a/gst/camerabin2/gstcamerabin2.c ++++ b/gst/camerabin2/gstcamerabin2.c +@@ -263,7 +263,7 @@ gst_cam_flags_get_type (void) + "elements", "no-image-conversion"}, + {0, NULL, NULL} + }; +- static volatile GType id = 0; ++ static GType id = 0; + + if (g_once_init_enter ((gsize *) & id)) { + GType _id; +diff --git a/gst/debugutils/gstfakevideosink.c b/gst/debugutils/gstfakevideosink.c +index 3ebc9a360b..ddb2ae1a0e 100644 +--- a/gst/debugutils/gstfakevideosink.c ++++ b/gst/debugutils/gstfakevideosink.c +@@ -54,7 +54,7 @@ gst_fake_video_sink_allocation_meta_flags_get_type (void) + "overlay-composition"}, + {0, NULL, NULL} + }; +- static volatile GType id = 0; ++ static GType id = 0; + + if (g_once_init_enter ((gsize *) & id)) { + GType _id; +diff --git a/gst/mxf/mxfmetadata.c b/gst/mxf/mxfmetadata.c +index 2860b68479..c8d34060d0 100644 +--- a/gst/mxf/mxfmetadata.c ++++ b/gst/mxf/mxfmetadata.c +@@ -6581,7 +6581,7 @@ mxf_descriptive_metadata_new (guint8 scheme, guint32 type, + GType + mxf_descriptive_metadata_framework_get_type (void) + { +- static volatile gsize type = 0; ++ static gsize type = 0; + if (g_once_init_enter (&type)) { + GType _type = 0; + static const GTypeInfo info = { +diff --git a/gst/netsim/gstnetsim.c b/gst/netsim/gstnetsim.c +index e0771b83e0..692b3893d2 100644 +--- a/gst/netsim/gstnetsim.c ++++ b/gst/netsim/gstnetsim.c +@@ -38,8 +38,8 @@ GST_DEBUG_CATEGORY (netsim_debug); + static GType + distribution_get_type (void) + { +- static volatile gsize g_define_type_id__volatile = 0; +- if (g_once_init_enter (&g_define_type_id__volatile)) { ++ static gsize static_g_define_type_id = 0; ++ if (g_once_init_enter (&static_g_define_type_id)) { + static const GEnumValue values[] = { + {DISTRIBUTION_UNIFORM, "uniform", "uniform"}, + {DISTRIBUTION_NORMAL, "normal", "normal"}, +@@ -48,9 +48,9 @@ distribution_get_type (void) + }; + GType g_define_type_id = + g_enum_register_static ("GstNetSimDistribution", values); +- g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); ++ g_once_init_leave (&static_g_define_type_id, g_define_type_id); + } +- return g_define_type_id__volatile; ++ return static_g_define_type_id; + } + + enum +diff --git a/gst/rtmp2/rtmp/amf.c b/gst/rtmp2/rtmp/amf.c +index 69c3768037..f103b91c57 100644 +--- a/gst/rtmp2/rtmp/amf.c ++++ b/gst/rtmp2/rtmp/amf.c +@@ -38,7 +38,7 @@ static GBytes *empty_bytes; + static void + init_static (void) + { +- static volatile gsize done = 0; ++ static gsize done = 0; + if (g_once_init_enter (&done)) { + empty_bytes = g_bytes_new_static ("", 0); + GST_DEBUG_CATEGORY_INIT (gst_rtmp_amf_debug_category, "rtmpamf", 0, +diff --git a/gst/rtmp2/rtmp/rtmpchunkstream.c b/gst/rtmp2/rtmp/rtmpchunkstream.c +index 1cdd68b26d..d3471e76b1 100644 +--- a/gst/rtmp2/rtmp/rtmpchunkstream.c ++++ b/gst/rtmp2/rtmp/rtmpchunkstream.c +@@ -31,7 +31,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_rtmp_chunk_stream_debug_category); + static void + init_debug (void) + { +- static volatile gsize done = 0; ++ static gsize done = 0; + if (g_once_init_enter (&done)) { + GST_DEBUG_CATEGORY_INIT (gst_rtmp_chunk_stream_debug_category, + "rtmpchunkstream", 0, "debug category for rtmp chunk streams"); +diff --git a/gst/rtmp2/rtmp/rtmpclient.c b/gst/rtmp2/rtmp/rtmpclient.c +index d2746ef74e..5a4ffcc812 100644 +--- a/gst/rtmp2/rtmp/rtmpclient.c ++++ b/gst/rtmp2/rtmp/rtmpclient.c +@@ -44,7 +44,7 @@ static void on_publish_or_play_status (const gchar * command_name, + static void + init_debug (void) + { +- static volatile gsize done = 0; ++ static gsize done = 0; + if (g_once_init_enter (&done)) { + GST_DEBUG_CATEGORY_INIT (gst_rtmp_client_debug_category, + "rtmpclient", 0, "debug category for the rtmp client"); +@@ -66,7 +66,7 @@ static const gchar *scheme_strings[] = { + GType + gst_rtmp_scheme_get_type (void) + { +- static volatile gsize scheme_type = 0; ++ static gsize scheme_type = 0; + static const GEnumValue scheme[] = { + {GST_RTMP_SCHEME_RTMP, "GST_RTMP_SCHEME_RTMP", "rtmp"}, + {GST_RTMP_SCHEME_RTMPS, "GST_RTMP_SCHEME_RTMPS", "rtmps"}, +@@ -142,7 +142,7 @@ gst_rtmp_scheme_get_default_port (GstRtmpScheme scheme) + GType + gst_rtmp_authmod_get_type (void) + { +- static volatile gsize authmod_type = 0; ++ static gsize authmod_type = 0; + static const GEnumValue authmod[] = { + {GST_RTMP_AUTHMOD_NONE, "GST_RTMP_AUTHMOD_NONE", "none"}, + {GST_RTMP_AUTHMOD_AUTO, "GST_RTMP_AUTHMOD_AUTO", "auto"}, +@@ -169,7 +169,7 @@ gst_rtmp_authmod_get_nick (GstRtmpAuthmod value) + GType + gst_rtmp_stop_commands_get_type (void) + { +- static volatile gsize stop_commands_type = 0; ++ static gsize stop_commands_type = 0; + static const GFlagsValue stop_commands[] = { + {GST_RTMP_STOP_COMMANDS_NONE, "No command", "none"}, + {GST_RTMP_STOP_COMMANDS_FCUNPUBLISH, "FCUnpublish", "fcunpublish"}, +diff --git a/gst/rtmp2/rtmp/rtmphandshake.c b/gst/rtmp2/rtmp/rtmphandshake.c +index 0d821c3d8e..10d0b36981 100644 +--- a/gst/rtmp2/rtmp/rtmphandshake.c ++++ b/gst/rtmp2/rtmp/rtmphandshake.c +@@ -34,7 +34,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_rtmp_handshake_debug_category); + static void + init_debug (void) + { +- static volatile gsize done = 0; ++ static gsize done = 0; + if (g_once_init_enter (&done)) { + GST_DEBUG_CATEGORY_INIT (gst_rtmp_handshake_debug_category, "rtmphandshake", + 0, "debug category for the rtmp connection handshake"); +diff --git a/gst/rtmp2/rtmp/rtmpmessage.c b/gst/rtmp2/rtmp/rtmpmessage.c +index c117d54d84..f59c09a7da 100644 +--- a/gst/rtmp2/rtmp/rtmpmessage.c ++++ b/gst/rtmp2/rtmp/rtmpmessage.c +@@ -146,7 +146,7 @@ gst_rtmp_user_control_type_get_nick (GstRtmpUserControlType type) + GType + gst_rtmp_meta_api_get_type (void) + { +- static volatile GType type = 0; ++ static GType type = 0; + static const gchar *tags[] = { + NULL + }; +diff --git a/gst/segmentclip/gstsegmentclip.c b/gst/segmentclip/gstsegmentclip.c +index 6d002b24f8..167bac4bff 100644 +--- a/gst/segmentclip/gstsegmentclip.c ++++ b/gst/segmentclip/gstsegmentclip.c +@@ -56,7 +56,7 @@ static GstElementClass *parent_class; + GType + gst_segment_clip_get_type (void) + { +- static volatile gsize segment_clip_type = 0; ++ static gsize segment_clip_type = 0; + + if (g_once_init_enter (&segment_clip_type)) { + GType _type; +diff --git a/sys/androidmedia/gstamcaudiodec.c b/sys/androidmedia/gstamcaudiodec.c +index 63253e09fd..2c43441307 100644 +--- a/sys/androidmedia/gstamcaudiodec.c ++++ b/sys/androidmedia/gstamcaudiodec.c +@@ -90,7 +90,7 @@ static GstAudioDecoderClass *parent_class = NULL; + GType + gst_amc_audio_dec_get_type (void) + { +- static volatile gsize type = 0; ++ static gsize type = 0; + + if (g_once_init_enter (&type)) { + GType _type; +diff --git a/sys/androidmedia/gstamcvideodec.c b/sys/androidmedia/gstamcvideodec.c +index 79c2f20f86..79670bd6df 100644 +--- a/sys/androidmedia/gstamcvideodec.c ++++ b/sys/androidmedia/gstamcvideodec.c +@@ -263,7 +263,7 @@ static GstVideoDecoderClass *parent_class = NULL; + GType + gst_amc_video_dec_get_type (void) + { +- static volatile gsize type = 0; ++ static gsize type = 0; + + if (g_once_init_enter (&type)) { + GType _type; +diff --git a/sys/androidmedia/gstamcvideoenc.c b/sys/androidmedia/gstamcvideoenc.c +index 8725520c98..591ca35de0 100644 +--- a/sys/androidmedia/gstamcvideoenc.c ++++ b/sys/androidmedia/gstamcvideoenc.c +@@ -114,7 +114,7 @@ static GstVideoEncoderClass *parent_class = NULL; + GType + gst_amc_video_enc_get_type (void) + { +- static volatile gsize type = 0; ++ static gsize type = 0; + + if (g_once_init_enter (&type)) { + GType _type; +diff --git a/sys/applemedia/coremediabuffer.c b/sys/applemedia/coremediabuffer.c +index 8f573be39d..70877d77f5 100644 +--- a/sys/applemedia/coremediabuffer.c ++++ b/sys/applemedia/coremediabuffer.c +@@ -93,7 +93,7 @@ gst_core_media_meta_transform (GstBuffer * transbuf, GstCoreMediaMeta * meta, + GType + gst_core_media_meta_api_get_type (void) + { +- static volatile GType type; ++ static GType type; + static const gchar *tags[] = { "memory", NULL }; + + if (g_once_init_enter (&type)) { +diff --git a/sys/applemedia/corevideobuffer.c b/sys/applemedia/corevideobuffer.c +index 63d737c135..f41685c04f 100644 +--- a/sys/applemedia/corevideobuffer.c ++++ b/sys/applemedia/corevideobuffer.c +@@ -80,7 +80,7 @@ gst_core_video_meta_transform (GstBuffer * transbuf, GstCoreVideoMeta * meta, + GType + gst_core_video_meta_api_get_type (void) + { +- static volatile GType type; ++ static GType type; + static const gchar *tags[] = { "memory", NULL }; + + if (g_once_init_enter (&type)) { +diff --git a/sys/applemedia/corevideomemory.c b/sys/applemedia/corevideomemory.c +index 5e832d474a..f072d339c9 100644 +--- a/sys/applemedia/corevideomemory.c ++++ b/sys/applemedia/corevideomemory.c +@@ -261,7 +261,7 @@ static GstAppleCoreVideoAllocator *_apple_core_video_allocator; + void + gst_apple_core_video_memory_init (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_APPLE_CORE_VIDEO_MEMORY, "corevideomemory", +diff --git a/sys/applemedia/iosglmemory.c b/sys/applemedia/iosglmemory.c +index f677efa4c3..7272f1b1f8 100644 +--- a/sys/applemedia/iosglmemory.c ++++ b/sys/applemedia/iosglmemory.c +@@ -105,7 +105,7 @@ gst_ios_gl_memory_allocator_init (GstIOSGLMemoryAllocator * allocator) + void + gst_ios_gl_memory_init (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_IOS_GL_MEMORY, "iosurface", 0, +diff --git a/sys/applemedia/iosurfaceglmemory.c b/sys/applemedia/iosurfaceglmemory.c +index 56e5bad031..d37e6e223e 100644 +--- a/sys/applemedia/iosurfaceglmemory.c ++++ b/sys/applemedia/iosurfaceglmemory.c +@@ -141,7 +141,7 @@ gst_io_surface_gl_memory_allocator_init (GstIOSurfaceGLMemoryAllocator * + void + gst_ios_surface_gl_memory_init (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_IO_SURFACE_GL_MEMORY, "iosurfacegl", 0, +diff --git a/sys/applemedia/iosurfacevulkanmemory.c b/sys/applemedia/iosurfacevulkanmemory.c +index b237cfb55d..2bf2e5da76 100644 +--- a/sys/applemedia/iosurfacevulkanmemory.c ++++ b/sys/applemedia/iosurfacevulkanmemory.c +@@ -114,7 +114,7 @@ gst_io_surface_vulkan_memory_allocator_init (GstIOSurfaceVulkanMemoryAllocator * + void + gst_io_surface_vulkan_memory_init (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_IO_SURFACE_VULKAN_MEMORY, +diff --git a/sys/bluez/gstavdtpsrc.h b/sys/bluez/gstavdtpsrc.h +index 34a2697f20..57e26493fa 100644 +--- a/sys/bluez/gstavdtpsrc.h ++++ b/sys/bluez/gstavdtpsrc.h +@@ -59,7 +59,7 @@ struct _GstAvdtpSrc + + GstPoll *poll; + GstPollFD pfd; +- volatile gint unlocked; ++ gint unlocked; + + GstClockTime duration; + +diff --git a/sys/d3d11/gstd3d11decoder.c b/sys/d3d11/gstd3d11decoder.c +index f88f3447b2..bc8c1f3a7e 100644 +--- a/sys/d3d11/gstd3d11decoder.c ++++ b/sys/d3d11/gstd3d11decoder.c +@@ -109,7 +109,7 @@ struct _GstD3D11DecoderPrivate + static GQuark + _decoder_output_view_get (void) + { +- static volatile gsize g_quark = 0; ++ static gsize g_quark = 0; + + if (g_once_init_enter (&g_quark)) { + gsize quark = +diff --git a/sys/d3d11/gstd3d11device.c b/sys/d3d11/gstd3d11device.c +index 0641e5a500..f91ebe5b70 100644 +--- a/sys/d3d11/gstd3d11device.c ++++ b/sys/d3d11/gstd3d11device.c +@@ -111,7 +111,7 @@ static void gst_d3d11_device_finalize (GObject * object); + static gboolean + gst_d3d11_device_enable_d3d11_debug (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + /* If all below libraries are unavailable, d3d11 device would fail with + * D3D11_CREATE_DEVICE_DEBUG flag */ +@@ -199,7 +199,7 @@ gst_d3d11_device_d3d11_debug (GstD3D11Device * device, + static gboolean + gst_d3d11_device_enable_dxgi_debug (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + gboolean ret = FALSE; + + /* If all below libraries are unavailable, d3d11 device would fail with +diff --git a/sys/d3d11/gstd3d11shader.c b/sys/d3d11/gstd3d11shader.c +index cbd3c69e40..835b7ccad7 100644 +--- a/sys/d3d11/gstd3d11shader.c ++++ b/sys/d3d11/gstd3d11shader.c +@@ -35,7 +35,7 @@ static pD3DCompile GstD3DCompileFunc = NULL; + gboolean + gst_d3d11_shader_init (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + #if GST_D3D11_WINAPI_ONLY_APP +diff --git a/sys/d3d11/gstd3d11utils.c b/sys/d3d11/gstd3d11utils.c +index 1d4d30d539..4cb0ae6299 100644 +--- a/sys/d3d11/gstd3d11utils.c ++++ b/sys/d3d11/gstd3d11utils.c +@@ -34,7 +34,7 @@ GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_utils_debug); + static void + _init_context_debug (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_GET (GST_CAT_CONTEXT, "GST_CONTEXT"); +diff --git a/sys/d3d11/gstd3d11videoprocessor.c b/sys/d3d11/gstd3d11videoprocessor.c +index 94e601dfe5..781592218b 100644 +--- a/sys/d3d11/gstd3d11videoprocessor.c ++++ b/sys/d3d11/gstd3d11videoprocessor.c +@@ -43,7 +43,7 @@ GST_DEBUG_CATEGORY_EXTERN (gst_d3d11_video_processor_debug); + GQuark + gst_d3d11_video_processor_input_view_quark (void) + { +- static volatile gsize quark = 0; ++ static gsize quark = 0; + + if (g_once_init_enter (&quark)) { + GQuark q = g_quark_from_static_string ("GstD3D11VideoProcessorInputView"); +@@ -56,7 +56,7 @@ gst_d3d11_video_processor_input_view_quark (void) + GQuark + gst_d3d11_video_processor_output_view_quark (void) + { +- static volatile gsize quark = 0; ++ static gsize quark = 0; + + if (g_once_init_enter (&quark)) { + GQuark q = g_quark_from_static_string ("GstD3D11VideoProcessorOutputView"); +diff --git a/sys/d3d11/gstd3d11window.cpp b/sys/d3d11/gstd3d11window.cpp +index ab98419466..6f827e3c7d 100644 +--- a/sys/d3d11/gstd3d11window.cpp ++++ b/sys/d3d11/gstd3d11window.cpp +@@ -73,7 +73,7 @@ static guint d3d11_window_signals[SIGNAL_LAST] = { 0, }; + GType + gst_d3d11_window_fullscreen_toggle_mode_type (void) + { +- static volatile gsize mode_type = 0; ++ static gsize mode_type = 0; + + if (g_once_init_enter (&mode_type)) { + static const GFlagsValue mode_types[] = { +diff --git a/sys/d3d11/gstd3d11window_win32.cpp b/sys/d3d11/gstd3d11window_win32.cpp +index 012ce6a0b8..de564d9519 100644 +--- a/sys/d3d11/gstd3d11window_win32.cpp ++++ b/sys/d3d11/gstd3d11window_win32.cpp +@@ -80,7 +80,7 @@ struct _GstD3D11WindowWin32 + gboolean have_swapchain1; + + /* atomic */ +- volatile gint pending_fullscreen_count; ++ gint pending_fullscreen_count; + + /* fullscreen related */ + RECT restore_rect; +diff --git a/sys/ipcpipeline/gstipcpipelinecomm.c b/sys/ipcpipeline/gstipcpipelinecomm.c +index 9176f49624..3dde66004b 100644 +--- a/sys/ipcpipeline/gstipcpipelinecomm.c ++++ b/sys/ipcpipeline/gstipcpipelinecomm.c +@@ -2318,7 +2318,7 @@ G_STMT_START { \ + void + gst_ipc_pipeline_comm_plugin_init (void) + { +- static volatile gsize once = 0; ++ static gsize once = 0; + + if (g_once_init_enter (&once)) { + GST_DEBUG_CATEGORY_INIT (gst_ipc_pipeline_comm_debug, "ipcpipelinecomm", 0, +diff --git a/sys/msdk/gstmsdkcontextutil.c b/sys/msdk/gstmsdkcontextutil.c +index 6f5c7e41d7..0cd24eb4ba 100644 +--- a/sys/msdk/gstmsdkcontextutil.c ++++ b/sys/msdk/gstmsdkcontextutil.c +@@ -38,7 +38,7 @@ static void + _init_context_debug (void) + { + #ifndef GST_DISABLE_GST_DEBUG +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_GET (GST_CAT_CONTEXT, "GST_CONTEXT"); +diff --git a/sys/nvcodec/gstcudacontext.c b/sys/nvcodec/gstcudacontext.c +index b6406f6873..35b03cf399 100644 +--- a/sys/nvcodec/gstcudacontext.c ++++ b/sys/nvcodec/gstcudacontext.c +@@ -121,7 +121,7 @@ gst_cuda_context_get_property (GObject * object, guint prop_id, + static void + gst_cuda_context_constructed (GObject * object) + { +- static volatile gsize once = 0; ++ static gsize once = 0; + GstCudaContext *context = GST_CUDA_CONTEXT (object); + GstCudaContextPrivate *priv = context->priv; + CUcontext cuda_ctx, old_ctx; +diff --git a/sys/nvcodec/gstcudautils.c b/sys/nvcodec/gstcudautils.c +index 052590209c..6d33bc484e 100644 +--- a/sys/nvcodec/gstcudautils.c ++++ b/sys/nvcodec/gstcudautils.c +@@ -36,7 +36,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_CONTEXT); + static void + _init_debug (void) + { +- static volatile gsize once_init = 0; ++ static gsize once_init = 0; + + if (g_once_init_enter (&once_init)) { + +@@ -354,7 +354,7 @@ static GQuark gst_cuda_quark_table[GST_CUDA_QUARK_MAX]; + static void + init_cuda_quark_once (void) + { +- static volatile gsize once_init = 0; ++ static gsize once_init = 0; + + if (g_once_init_enter (&once_init)) { + gint i; +diff --git a/sys/nvcodec/gstnvbaseenc.h b/sys/nvcodec/gstnvbaseenc.h +index e9b2fe15e0..069cd28ebc 100644 +--- a/sys/nvcodec/gstnvbaseenc.h ++++ b/sys/nvcodec/gstnvbaseenc.h +@@ -111,7 +111,7 @@ typedef struct { + GValue * input_formats; /* OBJECT LOCK */ + + GstVideoCodecState *input_state; +- volatile gint reconfig; /* ATOMIC */ ++ gint reconfig; /* ATOMIC */ + gboolean gl_input; + + /* array of allocated input/output buffers (GstNvEncFrameState), +diff --git a/sys/opensles/openslescommon.c b/sys/opensles/openslescommon.c +index 7dc4bb81f8..72cfc9d5da 100644 +--- a/sys/opensles/openslescommon.c ++++ b/sys/opensles/openslescommon.c +@@ -42,7 +42,7 @@ gst_opensles_recording_preset_get_type (void) + "voice-communication"}, + {0, NULL, NULL} + }; +- static volatile GType id = 0; ++ static GType id = 0; + + if (g_once_init_enter ((gsize *) & id)) { + GType _id; +@@ -100,7 +100,7 @@ gst_opensles_stream_type_get_type (void) + "GST_OPENSLES_STREAM_TYPE_NONE", "none"}, + {0, NULL, NULL} + }; +- static volatile GType id = 0; ++ static GType id = 0; + + if (g_once_init_enter ((gsize *) & id)) { + GType _id; +diff --git a/sys/va/gstvaallocator.c b/sys/va/gstvaallocator.c +index cd42ffb53a..f003b1fba8 100644 +--- a/sys/va/gstvaallocator.c ++++ b/sys/va/gstvaallocator.c +@@ -56,14 +56,14 @@ struct _GstVaBufferSurface + { + GstVideoInfo info; + VASurfaceID surface; +- volatile gint ref_count; ++ gint ref_count; + }; + + static void + _init_debug_category (void) + { + #ifndef GST_DISABLE_GST_DEBUG +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_INIT (gst_va_memory_debug, "vamemory", 0, "VA memory"); +@@ -573,7 +573,7 @@ struct _GstVaMemory + gpointer mapped_data; + + GstMapFlags prev_mapflags; +- volatile gint map_count; ++ gint map_count; + + gboolean is_derived; + gboolean is_dirty; +diff --git a/sys/va/gstvautils.c b/sys/va/gstvautils.c +index 95bfaee44b..ad2ad22fc8 100644 +--- a/sys/va/gstvautils.c ++++ b/sys/va/gstvautils.c +@@ -32,7 +32,7 @@ static void + _init_context_debug (void) + { + #ifndef GST_DISABLE_GST_DEBUG +- static volatile gsize _init = 0; ++ static gsize _init = 0; + + if (g_once_init_enter (&_init)) { + GST_DEBUG_CATEGORY_GET (GST_CAT_CONTEXT, "GST_CONTEXT"); +diff --git a/sys/wasapi/gstwasapiutil.c b/sys/wasapi/gstwasapiutil.c +index 61076df842..5d7ff38c4c 100644 +--- a/sys/wasapi/gstwasapiutil.c ++++ b/sys/wasapi/gstwasapiutil.c +@@ -144,7 +144,7 @@ gst_wasapi_device_role_get_type (void) + {GST_WASAPI_DEVICE_ROLE_COMMS, "Voice communications", "comms"}, + {0, NULL, NULL} + }; +- static volatile GType id = 0; ++ static GType id = 0; + + if (g_once_init_enter ((gsize *) & id)) { + GType _id; +diff --git a/sys/wasapi2/gstwasapi2client.cpp b/sys/wasapi2/gstwasapi2client.cpp +index 390bedf2c7..666b929697 100644 +--- a/sys/wasapi2/gstwasapi2client.cpp ++++ b/sys/wasapi2/gstwasapi2client.cpp +@@ -277,7 +277,7 @@ struct _GstWasapi2Client + GType + gst_wasapi2_client_device_class_get_type (void) + { +- static volatile GType class_type = 0; ++ static GType class_type = 0; + static const GEnumValue types[] = { + {GST_WASAPI2_CLIENT_DEVICE_CLASS_CAPTURE, "Capture", "capture"}, + {GST_WASAPI2_CLIENT_DEVICE_CLASS_RENDER, "Render", "render"}, +diff --git a/sys/winscreencap/dxgicapture.c b/sys/winscreencap/dxgicapture.c +index 07c30dc702..4b17e5e897 100644 +--- a/sys/winscreencap/dxgicapture.c ++++ b/sys/winscreencap/dxgicapture.c +@@ -166,7 +166,7 @@ static pD3DCompile GstD3DCompileFunc = NULL; + gboolean + gst_dxgicap_shader_init (void) + { +- static volatile gsize _init = 0; ++ static gsize _init = 0; + static const gchar *d3d_compiler_names[] = { + "d3dcompiler_47.dll", + "d3dcompiler_46.dll", +diff --git a/tests/check/libs/vkimage.c b/tests/check/libs/vkimage.c +index 09999b739c..6ef279b099 100644 +--- a/tests/check/libs/vkimage.c ++++ b/tests/check/libs/vkimage.c +@@ -149,7 +149,7 @@ struct view_stress + GMutex lock; + GCond cond; + gboolean ready; +- volatile int n_ops; ++ int n_ops; + GQueue *memories; + GstHarnessThread *threads[N_THREADS]; + }; +@@ -189,7 +189,7 @@ GST_START_TEST (test_image_view_stress) + g_mutex_init (&stress.lock); + g_cond_init (&stress.cond); + stress.ready = FALSE; +- stress.n_ops = 0; ++ g_atomic_int_set (&stress.n_ops, 0); + stress.memories = g_queue_new (); + + gst_video_info_set_format (&v_info, GST_VIDEO_FORMAT_RGBA, 16, 16); +-- +GitLab + diff --git a/gst-plugins-bad/Pkgfile b/gst-plugins-bad/Pkgfile index da771247e..f207d7a2a 100644 --- a/gst-plugins-bad/Pkgfile +++ b/gst-plugins-bad/Pkgfile @@ -1,15 +1,19 @@ # Description: A set of plugins for gstreamer that may pose distribution problems. # URL: https://gstreamer.freedesktop.org/modules/gst-plugins-bad.html # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: brotli chromaprint e2fsprogs faac faad2 gst-plugins-base ladspa lame libass libdca libdvdnav libmms libmodplug libmpcdec librsvg libsndfile libsrtp libusb libva libvpx libwebp mjpegtools neon openal openjpeg openldap rtmpdump x264 x265 -# Optional: krb5 +# Depends on: chromaprint e2fsprogs faac faad2 gst-plugins-base ladspa lame libass libdca libdvdnav libmms libmodplug libmpcdec librsvg libsndfile libsrtp libusb libva libvpx libwebp mjpegtools neon openal openjpeg rtmpdump x264 x265 +# Optional: brotli krb5 openldap name=gst-plugins-bad version=1.18.4 release=1 -source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz) +source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz + 68858358544dd3b7e20663f731db22fd74a78a45.patch + a9fafd98b74fd184b178604095d35ac6105119b8.patch) build() { + patch -Np1 -d $name-$version -i $SRC/68858358544dd3b7e20663f731db22fd74a78a45.patch + patch -Np1 -d $name-$version -i $SRC/a9fafd98b74fd184b178604095d35ac6105119b8.patch cd $name-$version meson build \ diff --git a/gst-plugins-bad/a9fafd98b74fd184b178604095d35ac6105119b8.patch b/gst-plugins-bad/a9fafd98b74fd184b178604095d35ac6105119b8.patch new file mode 100644 index 000000000..7ea607c27 --- /dev/null +++ b/gst-plugins-bad/a9fafd98b74fd184b178604095d35ac6105119b8.patch @@ -0,0 +1,27 @@ +From a9fafd98b74fd184b178604095d35ac6105119b8 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <arojas(a)archlinux.org> +Date: Sat, 24 Apr 2021 10:43:47 +0000 +Subject: [PATCH] Fix build with OpenEXR 3 + +Add a header that is no longer transitively included + +Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2…> +--- + ext/openexr/gstopenexrdec.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ext/openexr/gstopenexrdec.cpp b/ext/openexr/gstopenexrdec.cpp +index a83c35de9b..b85203e423 100644 +--- a/ext/openexr/gstopenexrdec.cpp ++++ b/ext/openexr/gstopenexrdec.cpp +@@ -29,6 +29,7 @@ + + #include <ImfRgbaFile.h> + #include <ImfIO.h> ++#include <ImfInt64.h> + using namespace Imf; + using namespace Imath; + +-- +GitLab +

1 0

ports/contrib (3.6): [notify] postgresql: fixed rpath for perl, moved post-install script to pre-install, you might need to readd the postgres user/group
by crux＠crux.nu 15 Aug '21

15 Aug '21

commit c7ffa45ab1e23abe8ef500957f44c41b30a59138 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Aug 15 11:14:35 2021 +0200 [notify] postgresql: fixed rpath for perl, moved post-install script to pre-install, you might need to readd the postgres user/group diff --git a/postgresql/.signature b/postgresql/.signature index 177098de2..e5228215c 100644 --- a/postgresql/.signature +++ b/postgresql/.signature @@ -1,8 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xUHVuSrPhSkH+WmhC6OeFjrCL6FKjATiaWg1NCA1q8JcZHPiQwh9D+mlS8uVoEX6IxAV9XFLkQUiPkCRH+CWw0= -SHA256 (Pkgfile) = 631691a46c8f39aae222c8cfee0af38c8846674c59fe086ffd907446e1cef612 +RWSagIOpLGJF37mExMAqU/y2U51Ud+ksRgxm7YWbeoyRGusGtHWcriMyxtDILV97XQtLhjpQzXop4KhSol4BHw0rBZ3DtDEcVAk= +SHA256 (Pkgfile) = eaac922639fdfb3452251318f6a7bd349dbaeae0dd98dfd1fb5a3e2344f7d8b9 SHA256 (.footprint) = fa3fd0484cb523c505cfe747b2b369242e68e6f61168b86b2b6ba1850bdc44e0 SHA256 (postgresql-13.4.tar.bz2) = ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd SHA256 (postgresql-run-socket.patch) = 02ffb53b0a5049233f665c873b96264db77daab30e5a2194d038202d815a8e6a +SHA256 (postgresql-perl-rpath.patch) = af6186d40128e043f333da4591455bf62b7c96e80214835f5c8c60b635ea9afb SHA256 (postgresql.rc) = 95ada4267034cf5d33340b8411a18f8cbd0428b5714afac16990b5c3a144f347 SHA256 (postgresql.pam) = 978a2542078a1216b0c23756f49e79ac5a99c905e5ec1e57867d0941a505668a diff --git a/postgresql/Pkgfile b/postgresql/Pkgfile index aea4e8661..fe80b2904 100644 --- a/postgresql/Pkgfile +++ b/postgresql/Pkgfile @@ -6,15 +6,16 @@ name=postgresql version=13.4 -release=1 +release=2 source=(https://ftp.postgresql.org/pub/source/v$version/postgresql-$version… - postgresql-run-socket.patch + postgresql-run-socket.patch postgresql-perl-rpath.patch postgresql.rc postgresql.pam) build() { cd $name-$version patch -Np1 -i $SRC/postgresql-run-socket.patch + patch -Np1 -i $SRC/postgresql-perl-rpath.patch # optionals {{{ prt-get isinst clang && PKGMK_PGSQL+=' --with-llvm' diff --git a/postgresql/postgresql-perl-rpath.patch b/postgresql/postgresql-perl-rpath.patch new file mode 100644 index 000000000..1eff65da4 --- /dev/null +++ b/postgresql/postgresql-perl-rpath.patch @@ -0,0 +1,13 @@ +diff -Naur postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile postgresql-9.1.5/src/pl/plperl/GNUmakefile +--- postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile 2012-08-14 18:41:04.000000000 -0400 ++++ postgresql-9.1.5/src/pl/plperl/GNUmakefile 2012-08-17 11:15:09.457116708 -0400 +@@ -55,6 +55,9 @@ + + SHLIB_LINK = $(perl_embed_ldflags) + ++# Force rpath to be used even though we disable it everywhere else ++SHLIB_LINK += $(rpath) ++ + REGRESS_OPTS = --dbname=$(PL_TESTDB) + REGRESS = plperl_setup plperl plperl_lc plperl_trigger plperl_shared \ + plperl_elog plperl_util plperl_init plperlu plperl_array \ diff --git a/postgresql/post-install b/postgresql/pre-install similarity index 100% rename from postgresql/post-install rename to postgresql/pre-install

1 0