January 2023 - crux-commits

ports/contrib (3.7): libvirt-python: updated to version 9.0.0
by crux＠crux.nu 23 Jan '23

23 Jan '23

commit e09ed819329f28dc8212208688e96f62a20c8f37 Author: Matt Housh <jaeger(a)crux.ninja> Date: Sun Jan 22 23:15:15 2023 -0600 libvirt-python: updated to version 9.0.0 diff --git a/libvirt-python/.footprint b/libvirt-python/.footprint index d440141f2..0b9652e5e 100644 --- a/libvirt-python/.footprint +++ b/libvirt-python/.footprint @@ -9,11 +9,11 @@ drwxr-xr-x root/root usr/lib/python3.10/site-packages/__pycache__/ -rw-r--r-- root/root usr/lib/python3.10/site-packages/__pycache__/libvirtaio.cpython-310.pyc -rw-r--r-- root/root usr/lib/python3.10/site-packages/libvirt.py -rw-r--r-- root/root usr/lib/python3.10/site-packages/libvirt_lxc.py -drwxr-xr-x root/root usr/lib/python3.10/site-packages/libvirt_python-8.10.0-py3.10.egg-info/ --rw-r--r-- root/root usr/lib/python3.10/site-packages/libvirt_python-8.10.0-py3.10.egg-info/PKG-INFO --rw-rw-r-- root/root usr/lib/python3.10/site-packages/libvirt_python-8.10.0-py3.10.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.10/site-packages/libvirt_python-8.10.0-py3.10.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.10/site-packages/libvirt_python-8.10.0-py3.10.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python3.10/site-packages/libvirt_python-9.0.0-py3.10.egg-info/ +-rw-r--r-- root/root usr/lib/python3.10/site-packages/libvirt_python-9.0.0-py3.10.egg-info/PKG-INFO +-rw-rw-r-- root/root usr/lib/python3.10/site-packages/libvirt_python-9.0.0-py3.10.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.10/site-packages/libvirt_python-9.0.0-py3.10.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.10/site-packages/libvirt_python-9.0.0-py3.10.egg-info/top_level.txt -rw-r--r-- root/root usr/lib/python3.10/site-packages/libvirt_qemu.py -rw-r--r-- root/root usr/lib/python3.10/site-packages/libvirtaio.py -rwxr-xr-x root/root usr/lib/python3.10/site-packages/libvirtmod.cpython-310-x86_64-linux-gnu.so diff --git a/libvirt-python/.signature b/libvirt-python/.signature index 218c5e629..7e0790534 100644 --- a/libvirt-python/.signature +++ b/libvirt-python/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39Nz3jF95aCvQ2K9x+2mxV0o6m5XbXn6SrHp1jGlAflyvt6uLH4lC9kC9E5f5mUcIYxHp5mDltZ7EcNaINdBrQI= -SHA256 (Pkgfile) = 6f31dfbee39ece3a96586f5fd08e807ac5ae72a03e3369ca7500834c608fc14c -SHA256 (.footprint) = 8f867fde62d42fe3990ce60a0d8afc7ad9d48950f1cde5cb0db4266d43f10f93 -SHA256 (libvirt-python-8.10.0.tar.gz) = fc30f136abe0b8228029a90814c8f44ac2947433c12f211363051c57df2d5401 +RWSagIOpLGJF3xI9L38j/+XGYzDGvGsAlDU4DC+kuTtOMD6C+8Fddymvzefp+vKflYC1XeIqWygo1nIWdRT+WjYkccv4Cir1gA8= +SHA256 (Pkgfile) = 72d538c55f50e5779c184a7267e37db4d87c59e3dd86145d3b77303674cb6831 +SHA256 (.footprint) = 6aa1e0b9aa54da001fd661e043bcb36d1a4539306d8a4ab38790fa5ef0449529 +SHA256 (libvirt-python-9.0.0.tar.gz) = 49702d33fa8cbcae19fa727467a69f7ae2241b3091324085ca1cc752b2b414ce diff --git a/libvirt-python/Pkgfile b/libvirt-python/Pkgfile index 6784404dc..d9369f348 100644 --- a/libvirt-python/Pkgfile +++ b/libvirt-python/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python3 libvirt name=libvirt-python -version=8.10.0 +version=9.0.0 release=1 source=(https://libvirt.org/sources/python/$name-$version.tar.gz)

1 0

ports/opt (3.7): grub2: cleaned up patches, fixed fgrep references
by crux＠crux.nu 23 Jan '23

23 Jan '23

commit 43066ac32d84d3379ecf3a07e0fd46d529e0621c Author: Matt Housh <jaeger(a)crux.ninja> Date: Sun Jan 22 23:13:22 2023 -0600 grub2: cleaned up patches, fixed fgrep references diff --git a/grub2/.signature b/grub2/.signature index 603b52de4..70381b2d1 100644 --- a/grub2/.signature +++ b/grub2/.signature @@ -1,9 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Z7OySsAxlT5Bvuw6IXCsCEnZ8/HGbvbdWyPMOXnIREd61KIE8cRhem89U4fdvmooOoSiCWyc0YPS/pNepUoXwg= -SHA256 (Pkgfile) = 0307f7380ce9f17edfd9428e87365e555a69a7031db4e38c79d9fb5e8458690c +RWSE3ohX2g5d/Tugij7l2s9daXoMEGg5Cy3nycSfNulx6n7vTBGMe5cdCBG7Obw12n/Dfde5JQF/Zo34UffGVyH4qiOlEPjsvQ0= +SHA256 (Pkgfile) = fd3e73c60329c5501cf7591a586ab26200666864cb9a063b56e459170f7ffe56 SHA256 (.footprint) = 3dcb92cc7537b4647fada7f2851b521bb7e6bffb6ddaa9110e6572f39dc22d34 SHA256 (grub-2.06.tar.xz) = b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1 SHA256 (unifont-9.0.06.pcf.gz) = 6d23e82ea3fd3d79849d675c0c30129b62a3973a83b4cdc05f9994efef773b86 -SHA256 (grub2-00_header.diff) = e4b30c60aa0fa37d48cad2c4e5a53278f1cd5f4ae2df075f55f7be5fa931f8a7 -SHA256 (grub2-10_linux.diff) = 5621b312a199647909a09e94e710bb4fca1a2be687d61e2ce7a3cf529f09d1ef +SHA256 (grub2-tweaks.diff) = 7b1b96a5d0d97bf671b34e3ab12e88a95ed343cbf7a548209b32bc86b4aeba39 SHA256 (grub.cfg.sample) = c2e72228c1dd150f727e8d611d6f14956080ce078651b03eb14fcf65b0917dda diff --git a/grub2/Pkgfile b/grub2/Pkgfile index 424539bb5..b227ee5e7 100644 --- a/grub2/Pkgfile +++ b/grub2/Pkgfile @@ -5,18 +5,16 @@ name=grub2 version=2.06 -release=2 +release=3 source=(http://ftp.gnu.org/gnu/grub/grub-$version.tar.xz \ http://jaeger.morpheus.net/linux/crux/files/unifont-9.0.06.pcf.gz \ - $name-00_header.diff $name-10_linux.diff grub.cfg.sample) + $name-tweaks.diff grub.cfg.sample) build() { export CFLAGS="${CFLAGS} -Wno-error -Os" export PYTHON=python3 cd grub-$version - - patch -i $SRC/$name-00_header.diff util/grub.d/00_header.in - patch -i $SRC/$name-10_linux.diff util/grub.d/10_linux.in + patch -p1 -i $SRC/$name-tweaks.diff ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/grub2/grub2-00_header.diff b/grub2/grub2-00_header.diff deleted file mode 100644 index 3b8ebb8da..000000000 --- a/grub2/grub2-00_header.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 00_header.in.orig 2015-01-01 16:27:17.433852566 -0600 -+++ 00_header.in 2015-01-01 16:27:28.603852605 -0600 -@@ -142,7 +142,7 @@ - if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT}"` ; then - EOF - else -- for dir in "${pkgdatadir}" "`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`" /usr/share/grub ; do -+ for dir in "${pkgdatadir}" "`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`" /usr/share/grub /usr/lib/grub/fonts ; do - for basename in unicode unifont ascii; do - path="${dir}/${basename}.pf2" - if is_path_readable_by_grub "${path}" > /dev/null ; then diff --git a/grub2/grub2-10_linux.diff b/grub2/grub2-10_linux.diff deleted file mode 100644 index 6a90cd8dd..000000000 --- a/grub2/grub2-10_linux.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- 10_linux.in.orig 2012-09-05 13:34:26.947842426 -0500 -+++ 10_linux.in 2012-09-05 13:34:55.967842887 -0500 -@@ -193,6 +193,7 @@ - initrd= - for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ - "initrd-${version}" "initramfs-${version}.img" \ -+ "initramfs-${version}.gz" \ - "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ - "initrd-${alt_version}" "initramfs-${alt_version}.img" \ - "initramfs-genkernel-${version}" \ diff --git a/grub2/grub2-tweaks.diff b/grub2/grub2-tweaks.diff new file mode 100644 index 000000000..f818f0a88 --- /dev/null +++ b/grub2/grub2-tweaks.diff @@ -0,0 +1,74 @@ +diff -urN grub-2.06.orig/util/grub.d/00_header.in grub-2.06/util/grub.d/00_header.in +--- grub-2.06.orig/util/grub.d/00_header.in 2018-11-24 11:13:02.000000000 -0600 ++++ grub-2.06/util/grub.d/00_header.in 2023-01-20 20:18:25.323977639 -0600 +@@ -152,7 +152,7 @@ + if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT}"` ; then + EOF + else +- for dir in "${pkgdatadir}" "`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`" /usr/share/grub ; do ++ for dir in "${pkgdatadir}" "`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`" /usr/share/grub /usr/lib/grub/fonts ; do + for basename in unicode unifont ascii; do + path="${dir}/${basename}.pf2" + if is_path_readable_by_grub "${path}" > /dev/null ; then +diff -urN grub-2.06.orig/util/grub.d/10_hurd.in grub-2.06/util/grub.d/10_hurd.in +--- grub-2.06.orig/util/grub.d/10_hurd.in 2019-10-21 07:02:43.000000000 -0500 ++++ grub-2.06/util/grub.d/10_hurd.in 2023-01-20 20:20:15.763433153 -0600 +@@ -176,7 +176,7 @@ + hurd_entry "$kernel" advanced + hurd_entry "$kernel" recovery + +- kernels=`echo $kernels | tr ' ' '\n' | fgrep -vx "$kernel" | tr '\n' ' '` ++ kernels=`echo $kernels | tr ' ' '\n' | grep -Fvx "$kernel" | tr '\n' ' '` + done + + # If at least one kernel was found, then we need to +diff -urN grub-2.06.orig/util/grub.d/10_kfreebsd.in grub-2.06/util/grub.d/10_kfreebsd.in +--- grub-2.06.orig/util/grub.d/10_kfreebsd.in 2019-10-21 07:02:43.000000000 -0500 ++++ grub-2.06/util/grub.d/10_kfreebsd.in 2023-01-20 20:20:21.670249001 -0600 +@@ -239,7 +239,7 @@ + kfreebsd_entry "${OS}" "${version}" recovery "-s" + fi + +- list=`echo $list | tr ' ' '\n' | fgrep -vx "$kfreebsd" | tr '\n' ' '` ++ list=`echo $list | tr ' ' '\n' | grep -Fvx "$kfreebsd" | tr '\n' ' '` + done + + # If at least one kernel was found, then we need to +diff -urN grub-2.06.orig/util/grub.d/10_linux.in grub-2.06/util/grub.d/10_linux.in +--- grub-2.06.orig/util/grub.d/10_linux.in 2020-12-22 17:24:17.000000000 -0600 ++++ grub-2.06/util/grub.d/10_linux.in 2023-01-20 20:19:01.471557011 -0600 +@@ -213,6 +213,7 @@ + initrd_real= + for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ + "initrd-${version}" "initramfs-${version}.img" \ ++ "initramfs-${version}.gz" \ + "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ + "initrd-${alt_version}" "initramfs-${alt_version}.img" \ + "initramfs-genkernel-${version}" \ +@@ -290,7 +291,7 @@ + "single ${GRUB_CMDLINE_LINUX}" + fi + +- list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '` ++ list=`echo $list | tr ' ' '\n' | grep -Fvx "$linux" | tr '\n' ' '` + done + + # If at least one kernel was found, then we need to +diff -urN grub-2.06.orig/util/grub.d/20_linux_xen.in grub-2.06/util/grub.d/20_linux_xen.in +--- grub-2.06.orig/util/grub.d/20_linux_xen.in 2020-12-22 17:24:17.000000000 -0600 ++++ grub-2.06/util/grub.d/20_linux_xen.in 2023-01-20 20:19:11.451809007 -0600 +@@ -346,12 +346,12 @@ + "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" + fi + +- list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '` ++ list=`echo $list | tr ' ' '\n' | grep -Fvx "$linux" | tr '\n' ' '` + done + if [ x"$is_top_level" != xtrue ]; then + echo ' }' + fi +- xen_list=`echo $xen_list | tr ' ' '\n' | fgrep -vx "$current_xen" | tr '\n' ' '` ++ xen_list=`echo $xen_list | tr ' ' '\n' | grep -Fvx "$current_xen" | tr '\n' ' '` + done + + # If at least one kernel was found, then we need to

1 0

ports/contrib (3.7): smpeg: fix source url, clean up footprint
by crux＠crux.nu 23 Jan '23

23 Jan '23

commit f0d69a3c2cf4f4df5ba7fb554e04597f82767891 Author: John McQuah <jmcquah(a)disroot.org> Date: Sun Jan 22 22:44:38 2023 -0500 smpeg: fix source url, clean up footprint diff --git a/smpeg/.footprint b/smpeg/.footprint index ca772bb0e..bddd5c662 100644 --- a/smpeg/.footprint +++ b/smpeg/.footprint @@ -20,12 +20,10 @@ drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libsmpeg-0.4.so.0 -> libsmpeg-0.4.so.0.1.4 -rwxr-xr-x root/root usr/lib/libsmpeg-0.4.so.0.1.4 -rw-r--r-- root/root usr/lib/libsmpeg.a --rwxr-xr-x root/root usr/lib/libsmpeg.la lrwxrwxrwx root/root usr/lib/libsmpeg.so -> libsmpeg-0.4.so.0.1.4 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/smpeg.m4 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/gtv.1.gz -rw-r--r-- root/root usr/share/man/man1/plaympeg.1.gz diff --git a/smpeg/.signature b/smpeg/.signature index e7a783916..9f8444422 100644 --- a/smpeg/.signature +++ b/smpeg/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30wqMEUs9vcIZlltFHYvYSb+IReOuoFjiDx0ZXU0hAljj6EA1YTm8B5scP5iWy7kSI/gU8cMnoWN6qIpiUh1TQQ= -SHA256 (Pkgfile) = 537212c68f64d0f418c600bc6b441fb3135aad2e9833461f3d92a0b434969bf5 -SHA256 (.footprint) = 67613a8dd579ca249cc311dd0a13be61ac168005889dccc6cc53190496d37ec7 -SHA256 (smpeg-0.4.5.tar.xz) = c1551535476ed521c7e1fff446846d44027cd4a8afe2ce30d71f6ef8bd6759ea +RWSagIOpLGJF3yUJE/JpD/sWytQvTTpauXXlPmajf4MU+lualPsjOoZ0L/scYZG5D0hwDFemCP8I6QkuyE2CjM+F2f3pu0KrXgE= +SHA256 (Pkgfile) = 286cf2c3dc4d36166833a8df5ca3d465da61f4a6f1f9dbe36cd7b16446fcf8e3 +SHA256 (.footprint) = ede54dc30aef43ce661b40034d9baa24d933bfb17e707247654969c26494e96c +SHA256 (smpeg-0.4.5.zip) = 4b40a6e8b3749995f4098c201823deaafa51ea186338f3130d6540509e00191d diff --git a/smpeg/Pkgfile b/smpeg/Pkgfile index 6ddce93df..e43f7f809 100644 --- a/smpeg/Pkgfile +++ b/smpeg/Pkgfile @@ -6,16 +6,24 @@ name=smpeg version=0.4.5 release=2 -source=(http://crux.ster.zone/downloads/$name/$name-$version.tar.xz) +source=(https://github.com/icculus/smpeg/archive/refs/tags/release_${version//./_}.zip) +renames=($name-$version.zip) build() { - cd $name-$version + cd $name-release_* CFLAGS+=' -Wno-error=narrowing' + export LDFLAGS="${LDFLAGS} -lX11" + ./autogen.sh ./configure \ --prefix=/usr \ - --mandir=/usr/share/man + --mandir=/usr/share/man \ + --enable-gtk-player=no # but its man-page is still installed? make make install DESTDIR=$PKG + + # delete la file and the dangling man-page + rm -f $PKG/usr/lib/lib$name.la + rm -f $PKG/usr/share/man/man1/gtv.1 } diff --git a/smpeg/generate b/smpeg/generate deleted file mode 100644 index f1aebbdd6..000000000 --- a/smpeg/generate +++ /dev/null @@ -1,8 +0,0 @@ -svn checkout svn://svn.icculus.org/smpeg/tags/release_0_4_5 -mv release_0_4_5 smpeg-0.4.5 -cd smpeg-0.4.5 -./autogen.sh -cd .. -bsdtar -c -f smpeg-0.4.5.tar smpeg-0.4.5 -xz -9 smpeg-0.4.5.tar -

1 0

ports/contrib (3.7): libmad: fix source url, delete unused pkgconf file
by crux＠crux.nu 23 Jan '23

23 Jan '23

commit bbfb16a9c1141bea6950e5861a84e0cd81fee269 Author: John McQuah <jmcquah(a)disroot.org> Date: Sun Jan 22 21:51:12 2023 -0500 libmad: fix source url, delete unused pkgconf file diff --git a/libmad/.signature b/libmad/.signature index 4c8645b80..a4a137a5b 100644 --- a/libmad/.signature +++ b/libmad/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF399Ewn+is4omO9E3RU2i8sNG/cdwI+LHjm3bx8PsPDzLpPy32Ye/6l1CUgmW0LG7vtgoV0Cnk5P9I6EZ0fndhwA= -SHA256 (Pkgfile) = fe0a90420b0caaa6dcd849db3e85c5e0797c704eb3ca41077c4ee508080e48c6 +RWSagIOpLGJF32vAkuJdQKBKUVD4Ytk2eQz9rreYosJAAQjYNI6ifzChqtQrjRgCzPk9u4jYLWjMIxodo27LC9JGDwMd/qBdBws= +SHA256 (Pkgfile) = ef5dda6167916ab376cb1df54075279b9741118f41159f0dc3454c32eab17af2 SHA256 (.footprint) = b51aee5bbeac3c686a29f9d5973bdab21f2dfc8610228ffe5b462d152e8565af -SHA256 (libmad-0.16.3.tar.gz) = 83ca48db60f480ae22234bae08e6ad651adec2667a68ad2df6fd61e6a50a32c7 +SHA256 (libmad-0.16.3.tar.gz) = 228bc0ea47d22ee70c087e7289e2c620829204972c9fe6ea8951ecf6c39d8966 diff --git a/libmad/Pkgfile b/libmad/Pkgfile index ac5d078bf..be0413866 100644 --- a/libmad/Pkgfile +++ b/libmad/Pkgfile @@ -1,15 +1,16 @@ # Description: High-quality MPEG Audio Decoder library. -# URL: http://www.underbit.com/products/mad/ +# URL: http://codeberg.org/tenacityteam/libmad # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: cmake +# Depends on: name=libmad version=0.16.3 release=1 -source=(https://github.com/tenacityteam/libmad/archive/$version/$name-$version.tar.gz) +source=(https://codeberg.org/tenacityteam/$name/archive/$version.tar.gz) +renames=($name-$version.tar.gz) build() { - cmake -S $name-$version -B build \ + cmake -S $name -B build \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ -D CMAKE_BUILD_TYPE=Release \ diff --git a/libmad/mad.pc b/libmad/mad.pc deleted file mode 100644 index 1331ce325..000000000 --- a/libmad/mad.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: mad -Description: MPEG Audio Decoder -Requires: -Version: #version# -Libs: -L${libdir} -lmad -lm -Cflags: -I${includedir}

1 0

ports/contrib (3.7): gst-plugins-bad: delete unused patches, enable openh264 codec if present
by crux＠crux.nu 23 Jan '23

23 Jan '23

commit 03182778f653f2ba3186be6250e86fbe0f54a31c Author: John McQuah <jmcquah(a)disroot.org> Date: Sun Jan 22 21:25:39 2023 -0500 gst-plugins-bad: delete unused patches, enable openh264 codec if present diff --git a/gst-plugins-bad/.signature b/gst-plugins-bad/.signature index 613faa75d..de0acc113 100644 --- a/gst-plugins-bad/.signature +++ b/gst-plugins-bad/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32dzIZsPKrT8BKkOJIC7Qk6/oB9hMVFTJZ9MLYluX8MqzvYXEsaFN34+v285kx8XdVvMHHX2eHthdGH/WTf69AA= -SHA256 (Pkgfile) = 2fd1212410a45186271cebb5b8ea63792a942e8c5c62efe61a3c8691b0b6eeec +RWSagIOpLGJF3xoNARSjW4yjT6GDaC67ptYlnIbK3OtD1o7//8pqwvCGGDiC0JKnRonionFT0MNU5QQME0+YTB6tm2lrXIhyzgo= +SHA256 (Pkgfile) = daa9a4b1b1c6fbfa0f8adb5afe34c6ecbf34e386fd122ecc5c9ab61b74f5c000 SHA256 (.footprint) = 08f9580f05f8ccd6aa77b300b0fa18628154f8b38033f4ff9458a687c9391d79 SHA256 (gst-plugins-bad-1.20.5.tar.xz) = f431214b0754d7037adcde93c3195106196588973e5b32dcb24938805f866363 diff --git a/gst-plugins-bad/68858358544dd3b7e20663f731db22fd74a78a45.patch b/gst-plugins-bad/68858358544dd3b7e20663f731db22fd74a78a45.patch deleted file mode 100644 index 592805229..000000000 --- a/gst-plugins-bad/68858358544dd3b7e20663f731db22fd74a78a45.patch +++ /dev/null @@ -1,1205 +0,0 @@ -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 55b112cee..f16ea7885 100644 --- a/gst-plugins-bad/Pkgfile +++ b/gst-plugins-bad/Pkgfile @@ -2,6 +2,7 @@ # URL: https://gstreamer.freedesktop.org/modules/gst-plugins-bad.html # Maintainer: Danny Rawlins, crux at romster dot me # Depends on: bluez brotli bzip2 chromaprint curl dav1d eudev expat faac faad2 fdk-aac ffmpeg flac glib gst-plugins-base gstreamer ladspa lame lcms2 libass libdrm libffi libglvnd libgmp libgudev libjpeg-turbo libmodplug libnghttp2 libnice libogg libpcre libpng libsndfile libsrtp libtheora libva libvdpau libvorbis libvpx libwebp lilv mjpegtools neon openal openjpeg2 opus orc rtmpdump shaderc soundtouch util-linux vulkan-loader x264 x265 xz zlib zstd +# Optional: openh264 name=gst-plugins-bad version=1.20.5 @@ -9,30 +10,32 @@ release=1 source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz) build() { - meson build $name-$version \ - --prefix /usr \ - --libexecdir lib \ - --buildtype plain \ - --wrap-mode nodownload \ - -D b_pie=true \ - -D doc=disabled \ - -D nls=disabled \ - -D directfb=disabled \ - -D flite=disabled \ - -D gsm=disabled \ - -D iqa=disabled \ - -D magicleap=disabled \ - -D msdk=disabled \ - -D openh264=disabled \ - -D openmpt=disabled \ - -D openni2=disabled \ - -D opensles=disabled \ - -D tinyalsa=disabled \ - -D voaacenc=disabled \ - -D voamrwbenc=disabled \ - -D wasapi2=disabled \ - -D wasapi=disabled \ - -D gobject-cast-checks=disabled \ + PKGMK_GSTBAD="--prefix=/usr + --libexecdir=lib + --buildtype=plain + --wrap-mode=nodownload + -D b_pie=true + -D doc=disabled + -D nls=disabled + -D directfb=disabled + -D flite=disabled + -D gsm=disabled + -D iqa=disabled + -D magicleap=disabled + -D msdk=disabled + -D openmpt=disabled + -D openni2=disabled + -D opensles=disabled + -D tinyalsa=disabled + -D voaacenc=disabled + -D voamrwbenc=disabled + -D wasapi2=disabled + -D wasapi=disabled + -D gobject-cast-checks=disabled" + prt-get isinst openh264 && PKGMK_GSTBAD+=" -D openh264=enabled" || \ + PKGMK_GSTBAD+=" -D openh264=disabled" + + meson setup build $name-$version $PKGMK_GSTBAD \ -D package-name="GStreamer Bad Plugins (CRUX Linux)" \ -D package-origin="https://crux.nu/" diff --git a/gst-plugins-bad/a9fafd98b74fd184b178604095d35ac6105119b8.patch b/gst-plugins-bad/a9fafd98b74fd184b178604095d35ac6105119b8.patch deleted file mode 100644 index 7ea607c27..000000000 --- a/gst-plugins-bad/a9fafd98b74fd184b178604095d35ac6105119b8.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 - diff --git a/gst-plugins-bad/neon-0.32.x.patch b/gst-plugins-bad/neon-0.32.x.patch deleted file mode 100644 index e467053c0..000000000 --- a/gst-plugins-bad/neon-0.32.x.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b83e85ab677c79b46f520abebd1ee031e3a139c0 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <heirecka(a)exherbo.org> -Date: Sun, 26 Sep 2021 21:34:30 +0200 -Subject: [PATCH] neon: Allow building against neon 0.32.x - -No API/ABI changes: https://github.com/notroj/neon/blob/0.32.0/NEWS#L3 - -Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1267> ---- - subprojects/gst-plugins-bad/ext/neon/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/subprojects/gst-plugins-bad/ext/neon/meson.build b/subprojects/gst-plugins-bad/ext/neon/meson.build -index bf49be9111..abd9763649 100644 ---- a/subprojects/gst-plugins-bad/ext/neon/meson.build -+++ b/subprojects/gst-plugins-bad/ext/neon/meson.build -@@ -1,4 +1,4 @@ --neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.31.99'], -+neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.32.99'], - required : get_option('neon')) - - if neon_dep.found() --- -GitLab -

1 0

ports/contrib (3.7): xmlto: fix man-page to show the true version number
by crux＠crux.nu 23 Jan '23

23 Jan '23

commit 56097a09cb68ebbe5dc9af0ef66b3547b6c64fe3 Author: John McQuah <jmcquah(a)disroot.org> Date: Sun Jan 22 20:54:28 2023 -0500 xmlto: fix man-page to show the true version number diff --git a/xmlto/.signature b/xmlto/.signature index 17bf87557..c3a42639a 100644 --- a/xmlto/.signature +++ b/xmlto/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38EzZ4ifJWmhKu9WWpBbCpGwknV2wc6lnr06AyGhnIYCLMtK/f6w1LNQ+iN7OMYWAQN6ZNW9d1zmEB96W53KHAo= -SHA256 (Pkgfile) = 08777ab252769473b3cbd3557a30aaba5790c3c167309236b8e0508c717a60c9 +RWSagIOpLGJF39o83G2ZWVMNicyN43SdCEkBZF5IIjxCcvyAhLqid7NwWCSpB4ngwEbnpedivg7X1FVgn2c+gILR9jSJyJZ6cA8= +SHA256 (Pkgfile) = 3335c5ce634ed980704384bd3099d48af3d6645dce633c8ae1a8499c291c12ff SHA256 (.footprint) = 1c7ce90f14fb6753481057c253f611cbebb1c1edba646f884174b4d36ad08557 SHA256 (xmlto-0.0.28.tar.bz2) = 1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276 diff --git a/xmlto/Pkgfile b/xmlto/Pkgfile index 6be811838..797b0dd64 100644 --- a/xmlto/Pkgfile +++ b/xmlto/Pkgfile @@ -1,6 +1,6 @@ # Description: Convert xml to many other formats. # URL: https://pagure.io/xmlto -# Maintainer: Danny Rawlins, crux at romster dot me +# Maintainer: John McQuah, jmcquah at disroot dot org # Depends on: docbook-xsl name=xmlto @@ -12,7 +12,7 @@ build() { cd $name-$version sed -i -e 's,4\.2,4\.5,g' doc/xmlif.xml - sed -i -e 's,4\.2,4\.5,g' doc/xmlto.xml + sed -i -e 's,4\.2,4\.5,g; /productname/s|25|28|;' doc/xmlto.xml ./configure \ --prefix=/usr

1 0

ports/contrib (3.7): docbook-xsl: update source url, delete unneeded patch
by crux＠crux.nu 23 Jan '23

23 Jan '23

commit 23a2e91b53b6bb6c48d8a080f67c151e300e8e26 Author: John McQuah <jmcquah(a)disroot.org> Date: Sun Jan 22 20:50:09 2023 -0500 docbook-xsl: update source url, delete unneeded patch diff --git a/docbook-xsl/.footprint b/docbook-xsl/.footprint index d8e93c5a2..a69caca51 100644 --- a/docbook-xsl/.footprint +++ b/docbook-xsl/.footprint @@ -1,11 +1,5 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/doc/ -drwxr-xr-x root/root usr/share/doc/docbook-xsl-1.79.2/ --rwxr-xr-x root/root usr/share/doc/docbook-xsl-1.79.2/RELEASE-NOTES.html --rwxr-xr-x root/root usr/share/doc/docbook-xsl-1.79.2/RELEASE-NOTES.pdf --rwxr-xr-x root/root usr/share/doc/docbook-xsl-1.79.2/RELEASE-NOTES.txt --rwxr-xr-x root/root usr/share/doc/docbook-xsl-1.79.2/RELEASE-NOTES.xml drwxr-xr-x root/root usr/share/xml/ drwxr-xr-x root/root usr/share/xml/docbook/ lrwxrwxrwx root/root usr/share/xml/docbook/xsl-stylesheets -> xsl-stylesheets-1.79.2 @@ -122,24 +116,24 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/eclipse/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/eclipse/profile-eclipse.xsl drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/ --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/dbtoepub +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/dbtoepub drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/lib/ --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/lib/docbook.rb +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/lib/docbook.rb drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/xslt/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/bin/xslt/obfuscate.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub/docbook.xsl -drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/ --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/LICENSE.txt --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/NOTICE.txt --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/build.xml --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/docbook.py --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/lucene-analyzers-3.0.0.jar --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/lucene-core-3.0.0.jar --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/saxon65.jar --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/tagsoup-1.2.1.jar --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/webhelpindexer.jar --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/xalan27.jar --rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/extensions/xslt.py +drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/ +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/build.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/chunk.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/chunkfast.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/docbook-epub.css.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/docbook.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/epub3-chunk-mods.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/epub3-element-mods.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/profile-chunk.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/profile-docbook.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/titlepage.templates.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/epub3/titlepage.templates.xsl drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/fo/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/fo/admon.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/fo/annotations.xsl @@ -434,13 +428,13 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/refentry.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/synop.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/table.xsl --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/tbl.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/tbl.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/utility.xsl drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/abstract.notitle.enabled.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/abstract.properties.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/abstract.title.properties.xml --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/activate.external.olinks.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/activate.external.olinks.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/active.toc.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/ade.extensions.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/admon.graphics.extension.xml @@ -462,7 +456,7 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/article.appendix.title.properties.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/author.othername.in.middle.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/autolayout-file.xml --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/autolink.index.see.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/autolink.index.see.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/autotoc.label.in.hyperlink.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/autotoc.label.separator.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/axf.extensions.xml @@ -623,7 +617,7 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/footnote.sep.leader.properties.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/fop.extensions.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/fop1.extensions.xml --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/force.blank.pages.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/force.blank.pages.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/formal.object.properties.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/formal.procedures.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/formal.title.placement.xml @@ -1049,7 +1043,7 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/sequential.links.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/shade.verbatim.style.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/shade.verbatim.xml --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/show.bookmarks.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/show.bookmarks.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/show.comments.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/show.foil.number.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/show.revisionflag.xml @@ -1194,7 +1188,7 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/xref.properties.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/xref.title-page.separator.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/xref.with.number.and.title.xml --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/xsl1.1.bookmarks.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/params/xsl1.1.bookmarks.xml drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/profiling/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/profiling/profile-mode.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/profiling/profile.xsl @@ -1402,7 +1396,7 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/h -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/help/help.pt-br.html drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/scripts/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/scripts/.htaccess --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/scripts/slidy.js +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/scripts/slidy.js -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/scripts/slidy.js.gz drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/styles/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/slides/slidy/styles/.htaccess @@ -1604,9 +1598,23 @@ drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/ -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/synop.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/table.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/task.xsl --rwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/titlepage.templates.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/titlepage.templates.xml -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/titlepage.templates.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/titlepage.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/toc.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/verbatim.xsl -rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml/xref.xsl +drwxr-xr-x root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/ +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/build.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/chunk.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/chunkfast.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/docbook.css.xml +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/docbook.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/html5-chunk-mods.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/html5-element-mods.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/onechunk.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/profile-chunk.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/profile-docbook.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/xhtml-docbook.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/xhtml-profile-docbook.xsl +-rw-r--r-- root/root usr/share/xml/docbook/xsl-stylesheets-1.79.2/xhtml5/xhtml2xhtml5.xsl diff --git a/docbook-xsl/.signature b/docbook-xsl/.signature index 75f2af173..836db98ca 100644 --- a/docbook-xsl/.signature +++ b/docbook-xsl/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF34vjglquuTEL6NRsDnHB+tvGb9lEmkW2r+RqpVKyBAehZaIEk/VIA3vp1dkyjMNlhczWwxrtLCNCj28PGGRMIAU= -SHA256 (Pkgfile) = 5e91bdeecf74272ba184048a52c800b7b30d0bfc243d71584e6261d0645a4ccf -SHA256 (.footprint) = f558ba108c1e62c7a61d2af2f0fc2671bcd3ed1fac23251d3a71b1336f7a5a91 -SHA256 (docbook-xsl-1.79.2.tar.bz2) = 316524ea444e53208a2fb90eeb676af755da96e1417835ba5f5eb719c81fa371 -SHA256 (non-recursive-string-subst.patch) = 193ec26dcb37bdf12037ed4ea98d68bd550500c8e96b719685d76d7096c3f9b3 +RWSagIOpLGJF3xATi6j1sah0A0ceVVzjzVGl1dbrCNbNXWCw/xmayCOg/gdHYVwYdnh/1r5Ic7xtyJra6oER2fEcDrIop1bP3gg= +SHA256 (Pkgfile) = 9d3b3d94f095203d26a5b066eee9c23f1e67a1bbb547db91c573178d30a920b1 +SHA256 (.footprint) = 4b6ed45e648412c75a129eafd09546c50576f7c56ed35cfac9b37a54b80f942f +SHA256 (docbook-xsl-nons-1.79.2.tar.bz2) = ee8b9eca0b7a8f89075832a2da7534bce8c5478fc8fc2676f512d5d87d832102 diff --git a/docbook-xsl/Pkgfile b/docbook-xsl/Pkgfile index 5e0f033bd..ec3685cea 100644 --- a/docbook-xsl/Pkgfile +++ b/docbook-xsl/Pkgfile @@ -1,36 +1,28 @@ # Description: A collection of XSL stylesheets that are useful for performing transformations on XML DocBook files. # URL: http://docbook.sourceforge.net/ -# Maintainer: Matt Housh, jaeger at crux dot ninja +# Maintainer: John McQuah, jmcquah at disroot dot org # Depends on: libxslt docbook-xml name=docbook-xsl version=1.79.2 -release=2 -source=(https://github.com/docbook/xslt10-stylesheets/releases/download/release/$version/$name-$version.tar.bz2 - non-recursive-string-subst.patch) +release=3 +source=(https://github.com/docbook/xslt10-stylesheets/releases/download/release/$version/$name-nons-$version.tar.bz2) build() { - cd $name-$version + cd $name-nons-$version - patch -Np2 -i $SRC/non-recursive-string-subst.patch install -v -m 0755 -d $PKG/usr/share/xml/docbook/xsl-stylesheets-$version cp -v -R \ - VERSION common eclipse epub extensions fo \ + VERSION common eclipse epub epub3 fo \ highlighting html htmlhelp images javahelp lib manpages \ params profiling roundtrip slides template tests tools website \ - xhtml xhtml-1_1 \ + xhtml xhtml-1_1 xhtml5 \ $PKG/usr/share/xml/docbook/xsl-stylesheets-$version ln -s VERSION $PKG/usr/share/xml/docbook/xsl-stylesheets-${version}/VERSION.xsl ln -sf xsl-stylesheets-$version $PKG/usr/share/xml/docbook/xsl-stylesheets - install -v -m 0644 -D README \ - $PKG/usr/share/doc/docbook-xsl-$version/README.txt - - install -v -m 0755 RELEASE-NOTES* NEWS* \ - $PKG/usr/share/doc/docbook-xsl-$version - find $PKG $ -name "NEWS*" -o -name "README*" -o -name "ChangeLog*" $ -delete } diff --git a/docbook-xsl/non-recursive-string-subst.patch b/docbook-xsl/non-recursive-string-subst.patch deleted file mode 100644 index ae845ad00..000000000 --- a/docbook-xsl/non-recursive-string-subst.patch +++ /dev/null @@ -1,32 +0,0 @@ -Description: use EXSLT "replace" function when available - A recursive implementation of string.subst is problematic, - long strings with many matches will cause stack overflows. -Author: Peter De Wachter <pdewacht(a)gmail.com> -Bug-Debian: https://bugs.debian.org/750593 - ---- docbook-xsl-1.78.1+dfsg.orig/docbook-xsl/lib/lib.xsl -+++ docbook-xsl-1.78.1+dfsg/docbook-xsl/lib/lib.xsl -@@ -6,7 +6,11 @@ - - This module implements DTD-independent functions - -- ******************************************************************** --><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> -+ ******************************************************************** --> -+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" -+ xmlns:str="http://exslt.org/strings" -+ exclude-result-prefixes="str" -+ version="1.0"> - - <xsl:template name="dot.count"> -  -@@ -52,6 +56,9 @@ - <xsl:param name="replacement"/> - - <xsl:choose> -+ <xsl:when test="function-available('str:replace')"> -+ <xsl:value-of select="str:replace($string, string($target), string($replacement))"/> -+ </xsl:when> - <xsl:when test="contains($string, $target)"> - <xsl:variable name="rest"> - <xsl:call-template name="string.subst"> - diff --git a/docbook-xsl/post-install b/docbook-xsl/post-install index 2779cfa6a..691b0a504 100755 --- a/docbook-xsl/post-install +++ b/docbook-xsl/post-install @@ -4,13 +4,8 @@ PREV=1.79.1 CUR=1.79.2 CATALOG=/etc/xml/catalog -if [ ! -d /etc/xml ]; then - install -m 0755 -d /etc/xml -fi - -if [ ! -f ${CATALOG} ]; then - xmlcatalog --noout --create ${CATALOG} -fi +[ -d /etc/xml ] || install -m 0755 -d /etc/xml +[ -f ${CATALOG} ] || xmlcatalog --noout --create ${CATALOG} xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-${PREV}" \ ${CATALOG}

1 0

ports/contrib (3.7): docbook-xml: new source urls, refactored build
by crux＠crux.nu 23 Jan '23

23 Jan '23

commit b71948a6a9f7f409ba57acd4ae2e6bc07645a6cd Author: John McQuah <jmcquah(a)disroot.org> Date: Sun Jan 22 20:45:14 2023 -0500 docbook-xml: new source urls, refactored build diff --git a/docbook-xml/.footprint b/docbook-xml/.footprint index 52fee4f56..d9a1cdf1c 100644 --- a/docbook-xml/.footprint +++ b/docbook-xml/.footprint @@ -5,38 +5,10 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/xml/ drwxr-xr-x root/root usr/share/xml/docbook/ -drwxr-xr-x root/root usr/share/xml/docbook/xml-dtd-4.1.2/ --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/calstblx.dtd --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/dbcentx.mod --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/dbgenent.mod --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/dbhierx.mod --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/dbnotnx.mod --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/dbpoolx.mod --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/docbook.cat --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/docbookx.dtd -drwxrwxr-x root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/ --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-amsa.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-amsb.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-amsc.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-amsn.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-amso.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-amsr.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-box.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-cyr1.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-cyr2.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-dia.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-grk1.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-grk2.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-grk3.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-grk4.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-lat1.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-lat2.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-num.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-pub.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/ent/iso-tech.ent --rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.1.2/soextblx.dtd drwxr-xr-x root/root usr/share/xml/docbook/xml-dtd-4.2/ -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.2/calstblx.dtd +-rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.2/catalog +-rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.2/catalog-4.1.2 -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.2/dbcentx.mod -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.2/dbgenent.mod -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.2/dbhierx.mod @@ -67,6 +39,7 @@ drwxr-xr-x root/root usr/share/xml/docbook/xml-dtd-4.2/ent/ -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.2/soextblx.dtd drwxr-xr-x root/root usr/share/xml/docbook/xml-dtd-4.3/ -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.3/calstblx.dtd +-rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.3/catalog -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.3/dbcentx.mod -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.3/dbgenent.mod -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.3/dbhierx.mod @@ -98,6 +71,7 @@ drwxr-xr-x root/root usr/share/xml/docbook/xml-dtd-4.3/ent/ -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.3/soextblx.dtd drwxr-xr-x root/root usr/share/xml/docbook/xml-dtd-4.4/ -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.4/calstblx.dtd +-rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.4/catalog -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.4/dbcentx.mod -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.4/dbgenent.mod -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.4/dbhierx.mod @@ -129,6 +103,7 @@ drwxr-xr-x root/root usr/share/xml/docbook/xml-dtd-4.4/ent/ -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.4/soextblx.dtd drwxr-xr-x root/root usr/share/xml/docbook/xml-dtd-4.5/ -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd +-rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.5/catalog -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod -rw-r--r-- root/root usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod diff --git a/docbook-xml/.signature b/docbook-xml/.signature index 5f5413a88..7d1f13acb 100644 --- a/docbook-xml/.signature +++ b/docbook-xml/.signature @@ -1,9 +1,8 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+bmcAJUvhXpjj3TtJRwt4DO3BYRhdHES+4hnoV3nRcH5Q0tCAGrRWrBzBtolbbv0QDT/iouMGl0BUWOsR22GAQ= -SHA256 (Pkgfile) = 1d82f5f78c0ebae2260f8f7971d0b8b94c4328ffd79b094ad2e36b6839a872a1 -SHA256 (.footprint) = f5076a66a0721e29f4a31a236972e6618c7be848cece16cbd8675fabe74528a2 -SHA256 (docbook-xml-4.5.zip) = 4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4 -SHA256 (docbook-xml-4.4.zip) = 02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090 -SHA256 (docbook-xml-4.3.zip) = 23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464 -SHA256 (docbook-xml-4.2.zip) = acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2 -SHA256 (docbkx412.zip) = 30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772 +RWSagIOpLGJF30pcyjOWUFq1AqUL8UcgKg+7lozQnH3pfC5KZSS2SnAVYCwwaMISKTdvNT2BcPJvZ8yegFqqAh7o43SIPJLq1gw= +SHA256 (Pkgfile) = 388b26617b28ac6b44e73cd85fe8eff3d184dd3b14f5804e6b18dcc195a77ac8 +SHA256 (.footprint) = 0584ac3bc24bb23a9213219ba043fb3d597c042aa9b4922e7e28a76474a7c5e2 +SHA256 (docbook-xml-4.5.zyp) = 4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4 +SHA256 (docbook-xml-4.4.zyp) = 02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090 +SHA256 (docbook-xml-4.3.zyp) = 23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464 +SHA256 (docbook-xml-4.2.zyp) = acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2 diff --git a/docbook-xml/Pkgfile b/docbook-xml/Pkgfile index e32257a89..2b7f46bc4 100644 --- a/docbook-xml/Pkgfile +++ b/docbook-xml/Pkgfile @@ -1,260 +1,69 @@ # Description: An document type definitions for verification of XML data files against the DocBook rule set. # URL: http://www.docbook.org/ -# Maintainer: Matt Housh, jaeger at crux dot ninja +# Maintainer: John McQuah, jmcquah at disroot dot org # Depends on: libxml2 unzip name=docbook-xml version=4.5 -release=7 -source=(http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip - http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip - http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip - http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip - http://www.docbook.org/xml/4.1.2/docbkx412.zip) - -unpack_source() { - # similarly-named versions first - local DTDVERSION - for DTDVERSION in 4.5 4.4 4.3 4.2; do - install -d $SRC/$name-$DTDVERSION - unzip -q -d $SRC/$name-$DTDVERSION $PKGMK_SOURCE_DIR/$name-$DTDVERSION.zip - done - - # now 4.1.2, named differently - install -d $SRC/$name-4.1.2 - unzip -q -d $SRC/$name-4.1.2 $PKGMK_SOURCE_DIR/docbkx412.zip -} +release=8 +source=(http://www.oasis-open.org/docbook/xml/${version}/docbook-xml-${version}.zip + http://www.oasis-open.org/docbook/xml/4.4/docbook-xml-4.4.zip + http://www.oasis-open.org/docbook/xml/4.3/docbook-xml-4.3.zip + http://www.oasis-open.org/docbook/xml/4.2/docbook-xml-4.2.zip) +renames=(docbook-xml-${version}.zyp + docbook-xml-4.4.zyp + docbook-xml-4.3.zyp + docbook-xml-4.2.zyp) build() { - # copy to proper locations - for DTDVERSION in 4.5 4.4 4.3 4.2 4.1.2 - do - install -d $PKG/usr/share/xml/docbook/xml-dtd-$DTDVERSION - cp -a $SRC/$name-$DTDVERSION/{ent,docbook.cat,*.dtd,*.mod} \ - $PKG/usr/share/xml/docbook/xml-dtd-$DTDVERSION/ - done - - find $PKG -type f $ -perm -g=r -o -perm -g=w $ -exec chmod -g=rw {} \+ + # map module filenames to their descriptions + declare -A DB_DESC + DB_DESC["docbookx.dtd"]="DTD DocBook\$xml V 4.\$vminor" + DB_DESC["calstblx.dtd"]="DTD DocBook\$xml CALS Table Model V 4.\$vminor" + DB_DESC["soextblx.dtd"]="DTD XML Exchange Table Model 1990315" + DB_DESC["dbpoolx.mod"]="ELEMENTS DocBook\$xml Information Pool V 4.\$vminor" + DB_DESC["dbhierx.mod"]="ELEMENTS DocBook\$xml Document Hierarchy V 4.\$vminor" + DB_DESC["htmltblx.mod"]="ELEMENTS DocBook XML HTML Tables V 4.\$vminor" + DB_DESC["dbnotnx.mod"]="ENTITIES DocBook\$xml Notations V 4.\$vminor" + DB_DESC["dbcentx.mod"]="ENTITIES DocBook\$xml Character Entities V 4.\$vminor" + DB_DESC["dbgenent.mod"]="ENTITIES DocBook\$xml Additional General Entities V 4.\$vminor" # create initial docbook-xml catalog - install -d $PKG/etc/xml - xmlcatalog --noout --create $PKG/etc/xml/$name + CATALOG="$PKG/etc/xml/$name" + install -d "$PKG/etc/xml" + xmlcatalog --noout --create "$CATALOG" # add each version to the initial catalog - # - # 4.5 - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V4.5//EN" \ - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \ - "http://www.oasis-open.org/docbook/xml/4.5/calstblx.dtd" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "http://www.oasis-open.org/docbook/xml/4.5/soextblx.dtd" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \ - "http://www.oasis-open.org/docbook/xml/4.5/dbpoolx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \ - "http://www.oasis-open.org/docbook/xml/4.5/dbhierx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \ - "http://www.oasis-open.org/docbook/xml/4.5/htmltblx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \ - "http://www.oasis-open.org/docbook/xml/4.5/dbnotnx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \ - "http://www.oasis-open.org/docbook/xml/4.5/dbcentx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ - "http://www.oasis-open.org/docbook/xml/4.5/dbgenent.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/4.5" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/4.5" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - $PKG/etc/xml/$name - # 4.4 - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V4.4//EN" \ - "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook CALS Table Model V4.4//EN" \ - "http://www.oasis-open.org/docbook/xml/4.4/calstblx.dtd" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" \ - "http://www.oasis-open.org/docbook/xml/4.4/htmltblx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "http://www.oasis-open.org/docbook/xml/4.4/soextblx.dtd" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN" \ - "http://www.oasis-open.org/docbook/xml/4.4/dbpoolx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN" \ - "http://www.oasis-open.org/docbook/xml/4.4/dbhierx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN" \ - "http://www.oasis-open.org/docbook/xml/4.4/dbgenent.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook Notations V4.4//EN" \ - "http://www.oasis-open.org/docbook/xml/4.4/dbnotnx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN" \ - "http://www.oasis-open.org/docbook/xml/4.4/dbcentx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/4.4" \ - "file:///usr/share/xml/docbook/xml-dtd-4.4" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/4.4" \ - "file:///usr/share/xml/docbook/xml-dtd-4.4" \ - $PKG/etc/xml/$name - # 4.3 - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V4.3//EN" \ - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook CALS Table Model V4.3//EN" \ - "http://www.oasis-open.org/docbook/xml/4.3/calstblx.dtd" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "http://www.oasis-open.org/docbook/xml/4.3/soextblx.dtd" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN" \ - "http://www.oasis-open.org/docbook/xml/4.3/dbpoolx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN" \ - "http://www.oasis-open.org/docbook/xml/4.3/dbhierx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook Additional General Entities V4.3//EN" \ - "http://www.oasis-open.org/docbook/xml/4.3/dbgenent.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook Notations V4.3//EN" \ - "http://www.oasis-open.org/docbook/xml/4.3/dbnotnx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook Character Entities V4.3//EN" \ - "http://www.oasis-open.org/docbook/xml/4.3/dbcentx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/4.3" \ - "file:///usr/share/xml/docbook/xml-dtd-4.3" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/4.3" \ - "file:///usr/share/xml/docbook/xml-dtd-4.3" \ - $PKG/etc/xml/$name - # 4.2 - xmlcatalog --noout --add "public" \ - "-//OASIS/DTD DocBook XML V4.2//EN" \ - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS/DTD DocBook CALS Table Model V4.2//EN" \ - "http://www.oasis-open.org/docbook/xml/4.2/calstblx.dtd" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS/DTD XML Exchange Table Model 19990315//EN" \ - "http://www.oasis-open.org/docbook/xml/4.2/soextblx.dtd" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS/ELEMENTS DocBook Information Pool V4.2//EN" \ - "http://www.oasis-open.org/docbook/xml/4.2/dbpoolx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS/ELEMENTS DocBook Document Hierarchy V4.2//EN" \ - "http://www.oasis-open.org/docbook/xml/4.2/dbhierx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS/ENTITIES DocBook Additional General Entities V4.2//EN" \ - "http://www.oasis-open.org/docbook/xml/4.2/dbgenent.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS/ENTITIES DocBook Notations V4.2//EN" \ - "http://www.oasis-open.org/docbook/xml/4.2/dbnotnx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS/ENTITIES DocBook Character Entities V4.2//EN" \ - "http://www.oasis-open.org/docbook/xml/4.2/dbcentx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/4.2" \ - "file:///usr/share/xml/docbook/xml-dtd-4.2" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/4.2" \ - "file:///usr/share/xml/docbook/xml-dtd-4.2" \ - $PKG/etc/xml/$name - # 4.1.2 - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V4.1.2//EN" \ - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \ - "http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "http://www.oasis-open.org/docbook/xml/4.1.2/soextblx.dtd" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \ - "http://www.oasis-open.org/docbook/xml/4.1.2/dbpoolx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \ - "http://www.oasis-open.org/docbook/xml/4.1.2/dbhierx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \ - "http://www.oasis-open.org/docbook/xml/4.1.2/dbgenent.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \ - "http://www.oasis-open.org/docbook/xml/4.1.2/dbnotnx.mod" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \ - "http://www.oasis-open.org/docbook/xml/4.1.2/dbcentx.mod" \ - $PKG/etc/xml/$name + for vminor in 5 4 3 2; do + dest="/usr/share/xml/docbook/xml-dtd-4.$vminor" + install -d -m755 "$PKG$dest" + bsdtar xf "$SRC/$name-4.$vminor.zyp" -C "$PKG$dest" && \ + mv "$PKG$dest/catalog.xml" "$PKG$dest/catalog" + + [ "$vminor" -lt 4 ] && xml="" || xml=" XML" + cd "$PKG$dest" + for DB_MOD in *.dtd *.mod; do + xmlcatalog --noout --add "public" \ + "-//OASIS//$(eval echo "${DB_DESC[$DB_MOD]}")//EN" \ + "http://www.oasis-open.org/docbook/xml/4.$vminor/$DB_MOD" \ + "$CATALOG" + done + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.$vminor" \ + "file://$dest" "$CATALOG" + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.$vminor" \ + "file://$dest" "$CATALOG" + done + + # special treatment for version 4.1.2 + dir412=$PKG/usr/share/xml/docbook/xml-dtd-4.2 + sed -e 's|V4.2|V4.1.2|g' "${dir412}/catalog" > "${dir412}/catalog-4.1.2" xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/4.1.2" \ - "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \ - $PKG/etc/xml/$name - xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/4.1.2" \ - "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \ - $PKG/etc/xml/$name + "http://www.oasis-open.org/docbook/xml/4.1.2" \ + "file:///usr/share/xml/docbook/xml-dtd-4.2" "$CATALOG" - rm $PKG/usr/share/xml/docbook/xml-dtd-4.{4,5}/ent/README + # fix permissions and delete junk files + find $PKG -type f $ -perm -g=r -o -perm -g=w $ -exec chmod -g=rw '{}' + + find $PKG $ -name "README" -o -name "ChangeLog" $ -delete } diff --git a/docbook-xml/post-install b/docbook-xml/post-install index 35b9956fe..452c89a2e 100755 --- a/docbook-xml/post-install +++ b/docbook-xml/post-install @@ -1,27 +1,25 @@ -#!/bin/bash +#!/bin/sh CATALOG=/etc/xml/catalog +name=docbook-xml -if [ ! -f ${CATALOG} ]; then - xmlcatalog --noout --create ${CATALOG} +if [ ! -f "$CATALOG" ]; then + mkdir -p /etc/xml + xmlcatalog --noout --create "$CATALOG" fi xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//ENTITIES DocBook XML" \ - "file:///etc/xml/docbook-xml" \ - ${CATALOG} + "file:///etc/xml/$name" $CATALOG xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//DTD DocBook XML" \ - "file:///etc/xml/docbook-xml" \ - ${CATALOG} + "file:///etc/xml/$name" $CATALOG xmlcatalog --noout --add "delegateSystem" \ "http://www.oasis-open.org/docbook/" \ - "file:///etc/xml/docbook-xml" \ - ${CATALOG} + "file:///etc/xml/$name" $CATALOG xmlcatalog --noout --add "delegateURI" \ "http://www.oasis-open.org/docbook/" \ - "file:///etc/xml/docbook-xml" \ - ${CATALOG} + "file:///etc/xml/$name" $CATALOG

1 0

ports/contrib (3.7): id3lib: fix build for gcc 12
by crux＠crux.nu 23 Jan '23

23 Jan '23

commit c0c850dcce614762668ccfbce219e85ccc130ceb Author: John McQuah <jmcquah(a)disroot.org> Date: Sun Jan 22 20:03:36 2023 -0500 id3lib: fix build for gcc 12 diff --git a/id3lib/.signature b/id3lib/.signature index 72dffc2bd..94ae477c0 100644 --- a/id3lib/.signature +++ b/id3lib/.signature @@ -1,11 +1,11 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF378NEje3bXiI419czAENHF3/FEGYZKxOwZs+bcRe8/hlquYgXCiB4GGn11X4LTkpa8QLyW5aK1Id/Xq6RQMu1ww= -SHA256 (Pkgfile) = 2da472246eab7c1f1d6615fa973196376e6ba245715ba3a89a383f4fc2419859 +RWSagIOpLGJF34MNZsmNNTwLeKIvDp16lHkuVm1vACp17SLLVCSdnL79/jVTAa7189vhdPy8tTTan8Bcdw+tXc5ewCo6lxsB2wQ= +SHA256 (Pkgfile) = 80ecc901d14ddc823868ce4b85e698140cb3caa35620d0d6363ece3ce92f6718 SHA256 (.footprint) = 1d74d6500595dabc037211dece8cd72001d3bba213949d521b3275087f0afa85 SHA256 (id3lib-3.8.3.tar.gz) = 2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079 -SHA256 (id3lib-3.8.3-zlib.patch) = 0b5531089422bda659deddcccf0562fcaa96529e74778065e35c848d6cf2a502 -SHA256 (id3lib-3.8.3-test_io.patch) = cc124f8805bcb977a1673f0b04fff368dac1af70d78c21da6f0415ce067d7687 +SHA256 (id3lib-3.8.3-gcc-4.3.patch) = e892313aea25c043c6fbe43e4bab041145ea454dbc04ea0e2e88b61345db7040 SHA256 (id3lib-3.8.3-autoconf259.patch) = ffde572cb263cce4585292143a4396ebd12592ac34b398da19d1608f1c2374f9 SHA256 (id3lib-3.8.3-unicode16.patch) = 71c79002d9485965a3a93e87ecbd7fed8f89f64340433b7ccd263d21385ac969 -SHA256 (id3lib-3.8.3-gcc-4.3.patch) = 536f6bb5dddd48df3c7fc080c04f03a2053ab11429094f2f31d6e2d5f21a987e +SHA256 (id3lib-3.8.3-missing-nullptr-check.patch) = e27d93dd84994e20485ebe22b1628c4fa6ebc26a538afd1ff5f5947ef1836dde +SHA256 (id3lib-3.8.3-abi-fix.patch) = 51fb502f76f918d44efa5ee62c6835c83467ef7363f37d5d6798a2a3e5346e44 SHA256 (CVE-2007-4460.diff) = 631545e2460cdd0f0566034149a51f409eda3c19871dd7d4c1c5280febc53a2f diff --git a/id3lib/Pkgfile b/id3lib/Pkgfile index 536111266..4c81cd08c 100644 --- a/id3lib/Pkgfile +++ b/id3lib/Pkgfile @@ -1,40 +1,37 @@ # Description: An open-source, cross-platform library for reading/writing/manipulating ID3 tags. # URL: http://id3lib.sourceforge.net/ -# Maintainer: Danny Rawlins, crux at romster dot me +# Maintainer: John McQuah, jmcquah at disroot dot org # Depends on: zlib name=id3lib version=3.8.3 -release=3 +release=4 source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name… - $name-3.8.3-zlib.patch - $name-3.8.3-test_io.patch - $name-3.8.3-autoconf259.patch - $name-3.8.3-unicode16.patch - $name-3.8.3-gcc-4.3.patch + $name-$version-gcc-4.3.patch + $name-$version-autoconf259.patch + $name-$version-unicode16.patch + $name-$version-missing-nullptr-check.patch + $name-$version-abi-fix.patch CVE-2007-4460.diff) build() { cd $name-$version - patch -p 1 -i $SRC/$name-3.8.3-zlib.patch - patch -p 1 -i $SRC/$name-3.8.3-test_io.patch - patch -p 1 -i $SRC/$name-3.8.3-autoconf259.patch - patch -p 1 -i $SRC/$name-3.8.3-unicode16.patch - patch -p 1 -i $SRC/$name-3.8.3-gcc-4.3.patch - patch -p 1 -i $SRC/CVE-2007-4460.diff + patch -p1 -i $SRC/$name-$version-gcc-4.3.patch + patch -p1 -i $SRC/$name-$version-autoconf259.patch + patch -p1 -i $SRC/$name-$version-unicode16.patch + patch -p1 -i $SRC/$name-$version-missing-nullptr-check.patch + patch -p1 -i $SRC/$name-$version-abi-fix.patch + patch -p1 -i $SRC/CVE-2007-4460.diff - sed -i -e 's/^AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \ - configure.in zlib/configure.in + sed -i 's/^AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' {.,zlib}/configure.in autoreconf -ivfs # buggy configure - CC='g++' \ - ./configure \ - --prefix=/usr \ - --disable-static \ - --disable-assert \ - --enable-debug=no + ./configure --prefix=/usr \ + --disable-static \ + --disable-assert \ + --enable-debug=no make make DESTDIR=$PKG install diff --git a/id3lib/id3lib-3.8.3-abi-fix.patch b/id3lib/id3lib-3.8.3-abi-fix.patch new file mode 100644 index 000000000..4b136178e --- /dev/null +++ b/id3lib/id3lib-3.8.3-abi-fix.patch @@ -0,0 +1,226 @@ +--- a/include/id3.h ++++ b/include/id3.h +@@ -47,12 +47,12 @@ extern "C" + ID3_C_EXPORT ID3Tag* CCONV ID3Tag_New (void); + ID3_C_EXPORT void CCONV ID3Tag_Delete (ID3Tag *tag); + ID3_C_EXPORT void CCONV ID3Tag_Clear (ID3Tag *tag); +- ID3_C_EXPORT bool CCONV ID3Tag_HasChanged (const ID3Tag *tag); +- ID3_C_EXPORT void CCONV ID3Tag_SetUnsync (ID3Tag *tag, bool unsync); +- ID3_C_EXPORT void CCONV ID3Tag_SetExtendedHeader (ID3Tag *tag, bool ext); +- ID3_C_EXPORT void CCONV ID3Tag_SetPadding (ID3Tag *tag, bool pad); ++ ID3_C_EXPORT ID3_Bool CCONV ID3Tag_HasChanged (const ID3Tag *tag); ++ ID3_C_EXPORT void CCONV ID3Tag_SetUnsync (ID3Tag *tag, ID3_Bool unsync); ++ ID3_C_EXPORT void CCONV ID3Tag_SetExtendedHeader (ID3Tag *tag, ID3_Bool ext); ++ ID3_C_EXPORT void CCONV ID3Tag_SetPadding (ID3Tag *tag, ID3_Bool pad); + ID3_C_EXPORT void CCONV ID3Tag_AddFrame (ID3Tag *tag, const ID3Frame *frame); +- ID3_C_EXPORT bool CCONV ID3Tag_AttachFrame (ID3Tag *tag, ID3Frame *frame); ++ ID3_C_EXPORT ID3_Bool CCONV ID3Tag_AttachFrame (ID3Tag *tag, ID3Frame *frame); + ID3_C_EXPORT void CCONV ID3Tag_AddFrames (ID3Tag *tag, const ID3Frame *frames, size_t num); + ID3_C_EXPORT ID3Frame* CCONV ID3Tag_RemoveFrame (ID3Tag *tag, const ID3Frame *frame); + ID3_C_EXPORT ID3_Err CCONV ID3Tag_Parse (ID3Tag *tag, const uchar header[ID3_TAGHEADERSIZE], const uchar *buffer); +@@ -66,7 +66,7 @@ extern "C" + ID3_C_EXPORT ID3Frame* CCONV ID3Tag_FindFrameWithASCII (const ID3Tag *tag, ID3_FrameID id, ID3_FieldID fld, const char *data); + ID3_C_EXPORT ID3Frame* CCONV ID3Tag_FindFrameWithUNICODE (const ID3Tag *tag, ID3_FrameID id, ID3_FieldID fld, const unicode_t *data); + ID3_C_EXPORT size_t CCONV ID3Tag_NumFrames (const ID3Tag *tag); +- ID3_C_EXPORT bool CCONV ID3Tag_HasTagType (const ID3Tag *tag, ID3_TagType); ++ ID3_C_EXPORT ID3_Bool CCONV ID3Tag_HasTagType (const ID3Tag *tag, ID3_TagType); + ID3_C_EXPORT ID3TagIterator* CCONV ID3Tag_CreateIterator (ID3Tag *tag); + ID3_C_EXPORT ID3TagConstIterator* CCONV ID3Tag_CreateConstIterator (const ID3Tag *tag); + +@@ -83,8 +83,8 @@ extern "C" + ID3_C_EXPORT void CCONV ID3Frame_SetID (ID3Frame *frame, ID3_FrameID id); + ID3_C_EXPORT ID3_FrameID CCONV ID3Frame_GetID (const ID3Frame *frame); + ID3_C_EXPORT ID3Field* CCONV ID3Frame_GetField (const ID3Frame *frame, ID3_FieldID name); +- ID3_C_EXPORT void CCONV ID3Frame_SetCompression (ID3Frame *frame, bool comp); +- ID3_C_EXPORT bool CCONV ID3Frame_GetCompression (const ID3Frame *frame); ++ ID3_C_EXPORT void CCONV ID3Frame_SetCompression (ID3Frame *frame, ID3_Bool comp); ++ ID3_C_EXPORT ID3_Bool CCONV ID3Frame_GetCompression (const ID3Frame *frame); + + /* field wrappers */ + ID3_C_EXPORT void CCONV ID3Field_Clear (ID3Field *field); +@@ -116,7 +116,7 @@ extern "C" + ID3_C_EXPORT flags_t CCONV ID3FrameInfo_FieldFlags (ID3_FrameID frameid, int fieldnum); + + /* Deprecated */ +- ID3_C_EXPORT void CCONV ID3Tag_SetCompression (ID3Tag *tag, bool comp); ++ ID3_C_EXPORT void CCONV ID3Tag_SetCompression (ID3Tag *tag, ID3_Bool comp); + + #ifdef __cplusplus + } + +--- a/include/id3/globals.h ++++ b/include/id3/globals.h +@@ -82,14 +82,10 @@ + + #define ID3_C_VAR extern + +-#ifndef __cplusplus +- +-typedef int bool; +-# define false (0) +-# define true (!false) +- +-#endif /* __cplusplus */ ++typedef int ID3_Bool; ++# define ID3_False 0 ++# define ID3_True 1 + + ID3_C_VAR const char * const ID3LIB_NAME; + ID3_C_VAR const char * const ID3LIB_RELEASE; + ID3_C_VAR const char * const ID3LIB_FULL_NAME; +@@ -532,9 +530,9 @@ ID3_STRUCT(Mp3_Headerinfo) + uint32 framesize; + uint32 frames; // nr of frames + uint32 time; // nr of seconds in song +- bool privatebit; +- bool copyrighted; +- bool original; ++ ID3_Bool privatebit; ++ ID3_Bool copyrighted; ++ ID3_Bool original; + }; + + #define ID3_NR_OF_V1_GENRES 148 + +--- a/src/c_wrapper.cpp ++++ b/src/c_wrapper.cpp +@@ -72,10 +72,10 @@ extern "C" + } + + +- ID3_C_EXPORT bool CCONV ++ ID3_C_EXPORT ID3_Bool CCONV + ID3Tag_HasChanged(const ID3Tag *tag) + { +- bool changed = false; ++ ID3_Bool changed = ID3_False; + + if (tag) + { +@@ -87,7 +87,7 @@ extern "C" + + + ID3_C_EXPORT void CCONV +- ID3Tag_SetUnsync(ID3Tag *tag, bool unsync) ++ ID3Tag_SetUnsync(ID3Tag *tag, ID3_Bool unsync) + { + if (tag) + { +@@ -97,7 +97,7 @@ extern "C" + + + ID3_C_EXPORT void CCONV +- ID3Tag_SetExtendedHeader(ID3Tag *tag, bool ext) ++ ID3Tag_SetExtendedHeader(ID3Tag *tag, ID3_Bool ext) + { + if (tag) + { +@@ -106,7 +106,7 @@ extern "C" + } + + ID3_C_EXPORT void CCONV +- ID3Tag_SetPadding(ID3Tag *tag, bool pad) ++ ID3Tag_SetPadding(ID3Tag *tag, ID3_Bool pad) + { + if (tag) + { +@@ -125,10 +125,10 @@ extern "C" + } + + +- ID3_C_EXPORT bool CCONV ++ ID3_C_EXPORT ID3_Bool CCONV + ID3Tag_AttachFrame(ID3Tag *tag, ID3Frame *frame) + { +- bool b = false; ++ ID3_Bool b = ID3_False; + if (tag) + { + ID3_CATCH(b = reinterpret_cast<ID3_Tag *>(tag)->AttachFrame(reinterpret_cast<ID3_Frame *>(frame))); +@@ -303,10 +303,10 @@ extern "C" + } + + +- ID3_C_EXPORT bool CCONV ++ ID3_C_EXPORT ID3_Bool CCONV + ID3Tag_HasTagType(const ID3Tag *tag, ID3_TagType tt) + { +- bool has_tt = false; ++ ID3_Bool has_tt = ID3_False; + + if (tag) + { +@@ -459,7 +459,7 @@ extern "C" + + + ID3_C_EXPORT void CCONV +- ID3Frame_SetCompression(ID3Frame *frame, bool comp) ++ ID3Frame_SetCompression(ID3Frame *frame, ID3_Bool comp) + { + if (frame) + { +@@ -468,10 +468,10 @@ extern "C" + } + + +- ID3_C_EXPORT bool CCONV ++ ID3_C_EXPORT ID3_Bool CCONV + ID3Frame_GetCompression(const ID3Frame *frame) + { +- bool compressed = false; ++ ID3_Bool compressed = ID3_False; + if (frame) + { + ID3_CATCH(compressed = reinterpret_cast<const ID3_Frame *>(frame)->GetCompression()); + +--- a/examples/findeng.cpp ++++ b/examples/findeng.cpp +@@ -9,7 +9,7 @@ + using std::cout; + using std::endl; + +-int main(unsigned argc, char* argv[]) ++int main(int argc, char* argv[]) + { + ID3D_INIT_DOUT(); + ID3D_INIT_WARNING(); + +--- a/examples/findstr.cpp ++++ b/examples/findstr.cpp +@@ -9,7 +9,7 @@ + using std::cout; + using std::endl; + +-int main(unsigned argc, char* argv[]) ++int main(int argc, char* argv[]) + { + ID3D_INIT_DOUT(); + ID3D_INIT_WARNING(); + +--- a/examples/test_io.cpp ++++ b/examples/test_io.cpp +@@ -18,13 +18,13 @@ using std::cerr; + using namespace dami; + + int +-main(size_t argc, const char** argv) ++main(int argc, const char** argv) + { + ID3D_INIT_DOUT(); + ID3D_INIT_WARNING(); + ID3D_INIT_NOTICE(); + +- ID3_IStreamReader isr(cin); ++ ID3_IStreamReader isr(std::cin); + BString orig = io::readAllBinary(isr); + + cout << "input size: " << orig.size() << endl; +@@ -116,7 +116,7 @@ main(size_t argc, const char** argv) + cout << "binary number:"; + for (size_t i = 0; i < number.size(); ++i) + { +- cout << " 0x" << hex << (size_t) (0xFF & number[i]) << dec; ++ cout << " 0x" << std::hex << (size_t) (0xFF & number[i]) << std::dec; + } + cout << endl; + diff --git a/id3lib/id3lib-3.8.3-gcc-4.3.patch b/id3lib/id3lib-3.8.3-gcc-4.3.patch index 090dc0bc0..c56552816 100644 --- a/id3lib/id3lib-3.8.3-gcc-4.3.patch +++ b/id3lib/id3lib-3.8.3-gcc-4.3.patch @@ -1,6 +1,5 @@ -diff -Naur id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in ---- id3lib-3.8.3-orig/configure.in 2008-03-05 18:03:25.000000000 -0600 -+++ id3lib-3.8.3/configure.in 2008-03-05 18:15:42.000000000 -0600 +--- a/configure.in ++++ b/configure.in @@ -227,7 +227,6 @@ ) AC_CHECK_HEADERS( \ @@ -9,9 +8,8 @@ diff -Naur id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in ,,AC_MSG_ERROR([Missing a vital header file for id3lib]) ) -diff -Naur id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h ---- id3lib-3.8.3-orig/include/id3/id3lib_strings.h 2008-03-05 18:19:46.000000000 -0600 -+++ id3lib-3.8.3/include/id3/id3lib_strings.h 2008-03-05 18:19:38.000000000 -0600 +--- a/include/id3/id3lib_strings.h ++++ b/include/id3/id3lib_strings.h @@ -30,6 +30,7 @@ #define _ID3LIB_STRINGS_H_ @@ -20,63 +18,15 @@ diff -Naur id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/i #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) namespace std -diff -Naur id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h ---- id3lib-3.8.3-orig/include/id3/writers.h 2003-03-01 18:23:00.000000000 -0600 -+++ id3lib-3.8.3/include/id3/writers.h 2008-03-05 18:23:05.000000000 -0600 + +--- a/include/id3/writers.h ++++ b/include/id3/writers.h @@ -30,7 +30,7 @@ #include "id3/writer.h" #include "id3/id3lib_streams.h" -//#include <string.h> -+#include <string.h> ++#include <cstring> class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer { -diff -Naur id3lib-3.8.3-orig/examples/demo_convert.cpp id3lib-3.8.3/examples/demo_convert.cpp ---- id3lib-3.8.3-orig/examples/demo_convert.cpp 2003-03-01 18:23:00.000000000 -0600 -+++ id3lib-3.8.3/examples/demo_convert.cpp 2008-03-05 18:26:50.000000000 -0600 -@@ -84,7 +84,7 @@ - } - } - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - flags_t ulFlag = ID3TT_ALL; - gengetopt_args_info args; -diff -Naur id3lib-3.8.3-orig/examples/demo_info.cpp id3lib-3.8.3/examples/demo_info.cpp ---- id3lib-3.8.3-orig/examples/demo_info.cpp 2003-03-01 18:23:00.000000000 -0600 -+++ id3lib-3.8.3/examples/demo_info.cpp 2008-03-05 18:27:40.000000000 -0600 -@@ -309,7 +309,7 @@ - - #define DEBUG - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - ID3D_INIT_DOUT(); - -diff -Naur id3lib-3.8.3-orig/examples/demo_tag.cpp id3lib-3.8.3/examples/demo_tag.cpp ---- id3lib-3.8.3-orig/examples/demo_tag.cpp 2003-03-01 18:23:00.000000000 -0600 -+++ id3lib-3.8.3/examples/demo_tag.cpp 2008-03-05 18:31:20.000000000 -0600 -@@ -46,7 +46,7 @@ - os << "v2"; - } - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - int ulFlag = ID3TT_ID3; - ID3D_INIT_DOUT(); -diff -Naur id3lib-3.8.3-orig/examples/demo_copy.cpp id3lib-3.8.3/examples/demo_copy.cpp ---- id3lib-3.8.3-orig/examples/demo_copy.cpp 2003-03-01 18:23:00.000000000 -0600 -+++ id3lib-3.8.3/examples/demo_copy.cpp 2008-03-05 18:32:44.000000000 -0600 -@@ -81,7 +81,7 @@ - } - } - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - int ulFlag = ID3TT_ID3; - ID3D_INIT_DOUT(); diff --git a/id3lib/id3lib-3.8.3-missing-nullptr-check.patch b/id3lib/id3lib-3.8.3-missing-nullptr-check.patch new file mode 100644 index 000000000..acc9f7513 --- /dev/null +++ b/id3lib/id3lib-3.8.3-missing-nullptr-check.patch @@ -0,0 +1,27 @@ +This patch adds a check for a null pointer +--- a/src/header_tag.cpp ++++ b/src/header_tag.cpp +@@ -54,7 +54,7 @@ + { + size_t bytesUsed = ID3_TagHeader::SIZE; + +- if (_info->is_extended) ++ if (_info && _info->is_extended) + { + bytesUsed += _info->extended_bytes; + } + +This patch by Urs Fleisch prevents crashes when reading VBR MP3 file. +Index: id3lib3.8.3-3.8.3/src/mp3_parse.cpp +=================================================================== +--- a/src/mp3_parse.cpp 2009-10-06 23:12:10.381250132 +0200 ++++ b/src/mp3_parse.cpp 2009-10-06 23:14:09.545252591 +0200 +@@ -465,7 +465,7 @@ + // from http://www.xingtech.com/developer/mp3/ + + const size_t VBR_HEADER_MIN_SIZE = 8; // "xing" + flags are fixed +- const size_t VBR_HEADER_MAX_SIZE = 116; // frames, bytes, toc and scale are optional ++ const size_t VBR_HEADER_MAX_SIZE = 120; // frames, bytes, toc and scale are optional + + if (mp3size >= vbr_header_offest + VBR_HEADER_MIN_SIZE) + { diff --git a/id3lib/id3lib-3.8.3-test_io.patch b/id3lib/id3lib-3.8.3-test_io.patch deleted file mode 100644 index b4a0d24d6..000000000 --- a/id3lib/id3lib-3.8.3-test_io.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- id3lib-3.8.3/examples/test_io.cpp.orig 2004-09-21 23:40:48.398826320 +0200 -+++ id3lib-3.8.3/examples/test_io.cpp 2004-09-21 23:40:55.408760648 +0200 -@@ -16,6 +16,7 @@ - using std::cerr; - - using namespace dami; -+using namespace std; - - int - main(size_t argc, const char** argv) diff --git a/id3lib/id3lib-3.8.3-zlib.patch b/id3lib/id3lib-3.8.3-zlib.patch deleted file mode 100644 index 177320bc1..000000000 --- a/id3lib/id3lib-3.8.3-zlib.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur id3lib-3.8.3.orig/Makefile.am id3lib-3.8.3/Makefile.am ---- id3lib-3.8.3.orig/Makefile.am 2003-03-01 16:23:00.000000000 -0800 -+++ id3lib-3.8.3/Makefile.am 2004-09-12 19:05:39.564456828 -0700 -@@ -28,7 +28,7 @@ - endif - - SUBDIRS = . m4 $(zlib_subdir) doc include id3com src examples --DIST_SUBDIRS = . m4 zlib doc include id3com src examples prj libprj -+DIST_SUBDIRS = . m4 $(zlib_subdir) doc include id3com src examples prj libprj - - INCLUDES = @ID3LIB_DEBUG_FLAGS@ - -diff -Naur id3lib-3.8.3.orig/src/Makefile.am id3lib-3.8.3/src/Makefile.am ---- id3lib-3.8.3.orig/src/Makefile.am 2003-03-01 16:23:00.000000000 -0800 -+++ id3lib-3.8.3/src/Makefile.am 2004-09-12 19:08:30.814149521 -0700 -@@ -77,6 +77,7 @@ - endif - - libid3_la_LDFLAGS = \ -+ -lz \ - -version-info $(LT_VERSION) \ - -release $(LT_RELEASE) \ - -export-dynamic

1 0

ports/contrib (3.7): texlab: 5.0.0 -> 5.1.0
by crux＠crux.nu 21 Jan '23

21 Jan '23

commit 58c37dad9792aac1b3e49dbc8304cbc5d5ed5495 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 21 13:43:06 2023 +0000 texlab: 5.0.0 -> 5.1.0 diff --git a/texlab/.signature b/texlab/.signature index 7738472de..e1365aa11 100644 --- a/texlab/.signature +++ b/texlab/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3z8aIS6iPTiORRRHyH+xpeyvL6Lm6EpOdboQg3bRc+cmJOuvgF+kb0aPYmzlr6SYGQnF/JaBzL2msqhoJCsy0AM= -SHA256 (Pkgfile) = 34c0bf4fe1faf906cc7fbbaa9ce290e4ea5485bf2b8c4fda033273dae6b2e2bd +RWSagIOpLGJF3+bgDdIDI3YvU1bI6BbBnhP41tx7L/pnG8UisnY3Qs14hIdHFZOke+8blPiVz3OfB5esxOiYPYnrAqOCnoaq7wA= +SHA256 (Pkgfile) = 2ddfbde80cd314276127d183a09f8696758a2ca315c1a8291c4328a2be0ad96e SHA256 (.footprint) = e269bf06cd399613cb5e2df75070c5210b53277a4c1478d41543e6c58a533387 -SHA256 (texlab-5.0.0.tar.gz) = 1c2b7008b123c01b867e77769c48f8bb63a55abfc95e4740c9066945ee3450b9 +SHA256 (texlab-5.1.0.tar.gz) = e327c78e079dc94290b34065cde92510f02db3f012aedcba4eb882bfc815cf55 diff --git a/texlab/Pkgfile b/texlab/Pkgfile index 33f37cb4e..19b73f135 100644 --- a/texlab/Pkgfile +++ b/texlab/Pkgfile @@ -4,7 +4,7 @@ # Depends on: rust name=texlab -version=5.0.0 +version=5.1.0 release=1 source=(https://github.com/latex-lsp/texlab/archive/v$version/$name-$versio…

1 0