November 2019 - crux-commits

ports/opt (3.5): gegl: 0.4.16 -> 0.4.18
by crux＠crux.nu 10 Nov '19

10 Nov '19

commit 63a0a8ad04db70e84bd3fd6320084dec6f6c837f Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Nov 10 11:56:49 2019 +1100 gegl: 0.4.16 -> 0.4.18 diff --git a/gegl/.footprint b/gegl/.footprint index 8f2b1edf2..e07f2c753 100644 --- a/gegl/.footprint +++ b/gegl/.footprint @@ -1,6 +1,5 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/gcut -rwxr-xr-x root/root usr/bin/gegl -rwxr-xr-x root/root usr/bin/gegl-imgcmp drwxr-xr-x root/root usr/include/ @@ -8,7 +7,6 @@ drwxr-xr-x root/root usr/include/gegl-0.4/ -rw-r--r-- root/root usr/include/gegl-0.4/gegl-apply.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-audio-fragment.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-buffer-backend.h --rw-r--r-- root/root usr/include/gegl-0.4/gegl-buffer-cl-iterator.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-buffer-enums.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-buffer-iterator.h -rw-r--r-- root/root usr/include/gegl-0.4/gegl-buffer-matrix2.h @@ -91,72 +89,42 @@ drwxr-xr-x root/root usr/include/gegl-0.4/sc/ -rw-r--r-- root/root usr/include/gegl-0.4/sc/sc-sample.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/gegl-0.4/ --rwxr-xr-x root/root usr/lib/gegl-0.4/gegl-common-cxx.la -rwxr-xr-x root/root usr/lib/gegl-0.4/gegl-common-cxx.so --rwxr-xr-x root/root usr/lib/gegl-0.4/gegl-common-gpl3.la -rwxr-xr-x root/root usr/lib/gegl-0.4/gegl-common-gpl3.so --rwxr-xr-x root/root usr/lib/gegl-0.4/gegl-common.la -rwxr-xr-x root/root usr/lib/gegl-0.4/gegl-common.so --rwxr-xr-x root/root usr/lib/gegl-0.4/gegl-core.la -rwxr-xr-x root/root usr/lib/gegl-0.4/gegl-core.so --rwxr-xr-x root/root usr/lib/gegl-0.4/gegl-generated.la -rwxr-xr-x root/root usr/lib/gegl-0.4/gegl-generated.so --rwxr-xr-x root/root usr/lib/gegl-0.4/gif-load.la -rwxr-xr-x root/root usr/lib/gegl-0.4/gif-load.so -rw-r--r-- root/root usr/lib/gegl-0.4/grey2.json --rwxr-xr-x root/root usr/lib/gegl-0.4/jpg-load.la -rwxr-xr-x root/root usr/lib/gegl-0.4/jpg-load.so --rwxr-xr-x root/root usr/lib/gegl-0.4/jpg-save.la -rwxr-xr-x root/root usr/lib/gegl-0.4/jpg-save.so --rwxr-xr-x root/root usr/lib/gegl-0.4/npd.la +-rwxr-xr-x root/root usr/lib/gegl-0.4/lcms-from-profile.so -rwxr-xr-x root/root usr/lib/gegl-0.4/npd.so --rwxr-xr-x root/root usr/lib/gegl-0.4/npy-save.la -rwxr-xr-x root/root usr/lib/gegl-0.4/npy-save.so --rwxr-xr-x root/root usr/lib/gegl-0.4/path.la -rwxr-xr-x root/root usr/lib/gegl-0.4/path.so --rwxr-xr-x root/root usr/lib/gegl-0.4/pixbuf.la --rwxr-xr-x root/root usr/lib/gegl-0.4/pixbuf.so --rwxr-xr-x root/root usr/lib/gegl-0.4/png-load.la +-rwxr-xr-x root/root usr/lib/gegl-0.4/pixbuf-load.so +-rwxr-xr-x root/root usr/lib/gegl-0.4/pixbuf-save.so -rwxr-xr-x root/root usr/lib/gegl-0.4/png-load.so --rwxr-xr-x root/root usr/lib/gegl-0.4/png-save.la -rwxr-xr-x root/root usr/lib/gegl-0.4/png-save.so --rwxr-xr-x root/root usr/lib/gegl-0.4/ppm-load.la -rwxr-xr-x root/root usr/lib/gegl-0.4/ppm-load.so --rwxr-xr-x root/root usr/lib/gegl-0.4/ppm-save.la -rwxr-xr-x root/root usr/lib/gegl-0.4/ppm-save.so --rwxr-xr-x root/root usr/lib/gegl-0.4/rgbe-load.la -rwxr-xr-x root/root usr/lib/gegl-0.4/rgbe-load.so --rwxr-xr-x root/root usr/lib/gegl-0.4/rgbe-save.la -rwxr-xr-x root/root usr/lib/gegl-0.4/rgbe-save.so --rwxr-xr-x root/root usr/lib/gegl-0.4/save-pixbuf.la --rwxr-xr-x root/root usr/lib/gegl-0.4/save-pixbuf.so --rwxr-xr-x root/root usr/lib/gegl-0.4/seamless-clone-compose.la -rwxr-xr-x root/root usr/lib/gegl-0.4/seamless-clone-compose.so --rwxr-xr-x root/root usr/lib/gegl-0.4/seamless-clone.la -rwxr-xr-x root/root usr/lib/gegl-0.4/seamless-clone.so --rwxr-xr-x root/root usr/lib/gegl-0.4/svg-load.la -rwxr-xr-x root/root usr/lib/gegl-0.4/svg-load.so --rwxr-xr-x root/root usr/lib/gegl-0.4/text.la -rwxr-xr-x root/root usr/lib/gegl-0.4/text.so --rwxr-xr-x root/root usr/lib/gegl-0.4/tiff-load.la -rwxr-xr-x root/root usr/lib/gegl-0.4/tiff-load.so --rwxr-xr-x root/root usr/lib/gegl-0.4/tiff-save.la -rwxr-xr-x root/root usr/lib/gegl-0.4/tiff-save.so --rwxr-xr-x root/root usr/lib/gegl-0.4/transformops.la -rwxr-xr-x root/root usr/lib/gegl-0.4/transformops.so --rwxr-xr-x root/root usr/lib/gegl-0.4/vector-fill.la -rwxr-xr-x root/root usr/lib/gegl-0.4/vector-fill.so --rwxr-xr-x root/root usr/lib/gegl-0.4/vector-stroke.la -rwxr-xr-x root/root usr/lib/gegl-0.4/vector-stroke.so drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/Gegl-0.4.typelib --rwxr-xr-x root/root usr/lib/libgegl-0.4.la -lrwxrwxrwx root/root usr/lib/libgegl-0.4.so -> libgegl-0.4.so.0.416.0 -lrwxrwxrwx root/root usr/lib/libgegl-0.4.so.0 -> libgegl-0.4.so.0.416.0 --rwxr-xr-x root/root usr/lib/libgegl-0.4.so.0.416.0 --rwxr-xr-x root/root usr/lib/libgegl-npd-0.4.la +lrwxrwxrwx root/root usr/lib/libgegl-0.4.so -> libgegl-0.4.so.0 +lrwxrwxrwx root/root usr/lib/libgegl-0.4.so.0 -> libgegl-0.4.so.0.417.1 +-rwxr-xr-x root/root usr/lib/libgegl-0.4.so.0.417.1 -rwxr-xr-x root/root usr/lib/libgegl-npd-0.4.so --rwxr-xr-x root/root usr/lib/libgegl-sc-0.4.la -rwxr-xr-x root/root usr/lib/libgegl-sc-0.4.so drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gegl-0.4.pc diff --git a/gegl/.signature b/gegl/.signature index b7f158c71..cbb45199a 100644 --- a/gegl/.signature +++ b/gegl/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ZL+s9ijr2Q8VjwYZvE1n77en/E85Xwsj9olF7L7eagBStudfZ7yn41Upom6jE9EXo6BPrfQ6dSLhe6MNou9DwA= -SHA256 (Pkgfile) = fe3466ea4e92bf1b3ba6c317ba65621b69b6e1be97ec187fb24ae46d8f9778e7 -SHA256 (.footprint) = 7f365f51ee61912d86683c549e4e7c760b4e515a17e46dddc59cd8519ffe02dd -SHA256 (gegl-0.4.16.tar.bz2) = 0112df690301d9eb993cc48965fc71b7751c9021a4f4ee08fcae366c326b5e5a +RWSE3ohX2g5d/RBHWyDZ/0s0WNE9BbcayKYaPmVDybf7kBcleVvj9ujoPELj6+/zyaHui+alZjXa8wsIYcW+4BH1+q4pxxueOQM= +SHA256 (Pkgfile) = 8dbd28d8165027ae6addf7223c10914b5b79d08b400d399c7ce25d6665426395 +SHA256 (.footprint) = 3b83055ec374a43da220640c486fd02eacd780acf88386383249e4aa0c3a3997 +SHA256 (gegl-0.4.18.tar.xz) = c946dfb45beb7fe0fb95b89a25395b449eda2b205ba3e8a1ffb1ef992d9eca64 diff --git a/gegl/Pkgfile b/gegl/Pkgfile index 412d88379..167acaf80 100644 --- a/gegl/Pkgfile +++ b/gegl/Pkgfile @@ -1,19 +1,17 @@ # Description: graph based image processing framework # URL: http://gegl.org # Maintainer: Thomas Penteker, tek at serverop dot de -# Packager: Simone Rota, sip at crux dot nu -# Depends on: babl gexiv2 glu json-glib librsvg util-linux -# Optional: libsdl ffmpeg +# Depends on: babl gexiv2 glu json-glib librsvg +# Optional: libsdl2 ffmpeg name=gegl -version=0.4.16 -release=2 -source=(https://ftp.gimp.org/pub/$name/${version%.*}/$name-$version.tar.bz2) +version=0.4.18 +release=1 +source=(https://download.gimp.org/pub/$name/${version%.*}/$name-$version.tar.xz) build() { cd $name-$version - ./configure $PKGMK_GEGL --prefix=/usr --disable-docs - make - make DESTDIR=$PKG install + meson build --prefix /usr + DESTDIR=$PKG ninja -C build -j ${JOBS:-1} install rm -r $PKG/usr/share/locale }

1 0

ports/opt (3.5): [notify] babl: add missing dependency lcms2
by crux＠crux.nu 10 Nov '19

10 Nov '19

commit 23101e3aae65c6c4a295b26bdbf6b78ec327be76 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Nov 10 11:54:20 2019 +1100 [notify] babl: add missing dependency lcms2 diff --git a/babl/.signature b/babl/.signature index e1658b2a6..ab8d84ae1 100644 --- a/babl/.signature +++ b/babl/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ZQQaUtf5yILNzaQbVKKw5+lqpfrD2fNMSHo9jLiauZgTgkmr2RvdEUqbg6Vhy5MgLsumC3AhhW0C78kxgRFAwA= -SHA256 (Pkgfile) = 0cf537a005f0d5ba99a28439febb89317cd382be54a3e560c32dc9903e2b5fb1 +RWSE3ohX2g5d/fmX47OSvz/p9RBwOwY3BfJovnS/ieA73n1i1TS21ypuYrqjFxK9iRtdw77SFy6LT2Z34xH6sOXEIKXIzR7jqQM= +SHA256 (Pkgfile) = 94b39119694a5479642dfd8e23221a2adc2f056253cfae3a26c3e4f9b8e607ee SHA256 (.footprint) = 98eadd9e49d282acb4444095853b506582ec2c1d733aae8253040e70447472b4 SHA256 (babl-0.1.72.tar.xz) = 64e111097b1fa22f6c9bf044e341a9cd9ee1372c5acfa0b452e7a86fb37c6a42 diff --git a/babl/Pkgfile b/babl/Pkgfile index fb87d8bdc..56b317467 100644 --- a/babl/Pkgfile +++ b/babl/Pkgfile @@ -1,8 +1,7 @@ # Description: Dynamic, any to any, pixel format translation library # URL: http://gegl.org/babl # Maintainer: Thomas Penteker, tek at serverop dot de -# Packager: Simone Rota, sip at crux dot nu -# Depends on: meson ninja gobject-introspection +# Depends on: gobject-introspection lcms2 name=babl version=0.1.72

1 0

ports/contrib (3.5): faad2: 2.9.0 -> 2.9.1
by crux＠crux.nu 10 Nov '19

10 Nov '19

commit 69e88c8a56bf54ecd0929d6a0e90c9ec6b2736ee Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Nov 10 11:16:11 2019 +1100 faad2: 2.9.0 -> 2.9.1 diff --git a/faad2/.signature b/faad2/.signature index b21fdd048..2e4407fc7 100644 --- a/faad2/.signature +++ b/faad2/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/DZlBrr1xlnLxqnskKAZidKkk6B6P6EW/FVUICfDSu0r53mRmZkqBnEgHAKMqU3ziTXphpKb2XtiHqdcslQiA0= -SHA256 (Pkgfile) = b4dce1c3ce82fb482219d2f4af59a0c39ba005e501840648f66ec067aa5c4aa4 +RWSagIOpLGJF31QEnh+escRiIJ/3fceUvXCIPBfByjwIJvqqg1dxEsK2wTjwXrTzJfCOiHcaYF0LTTKweEKT25yiw8pIZBIQ6Q8= +SHA256 (Pkgfile) = b3f0f548e1bd5136dde37d60a28d0f7ee7cc2e07de49d25582781efd26ee74be SHA256 (.footprint) = fca594c4b8c180ea14ca06a51517957272687f6007f5e88a6adb762b0798ca9b -SHA256 (faad2_2_9_0.tar.gz) = be30fbb0ea7999fe04ea7a5d5298eec15c256ddff4d5d7c584d5344fb9b0d2d4 +SHA256 (faad2_2_9_1.tar.gz) = 7fa33cff76abdda5a220ca5de0b2e05a77354f3b97f735193c2940224898aa9a diff --git a/faad2/Pkgfile b/faad2/Pkgfile index 577954330..c09875faa 100644 --- a/faad2/Pkgfile +++ b/faad2/Pkgfile @@ -3,15 +3,14 @@ # Maintainer: Danny Rawlins, crux at romster dot me name=faad2 -version=2.9.0 +version=2.9.1 release=1 source=(https://github.com/knik0/$name/archive/${version//./_}/${name}_${ve… build() { cd $name-${version//./_} - autoreconf -i - + ./bootstrap ./configure --prefix=/usr make

1 0

ports/contrib (3.5): faac: 1.29.9.2 -> 1.30
by crux＠crux.nu 10 Nov '19

10 Nov '19

commit 2b813a7a3a1c5730e63d1a4c3ff4156685077729 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Nov 10 11:15:46 2019 +1100 faac: 1.29.9.2 -> 1.30 diff --git a/faac/.signature b/faac/.signature index 2d7a297a3..458a56ce8 100644 --- a/faac/.signature +++ b/faac/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39RQeyV9Am+JxArgoWEWi4UJW0gBDSUYTGupEkwxgBHrfezv0j09HJ3Ahz1irYDVnBE/UqFDjF2VF7GtenY1BQQ= -SHA256 (Pkgfile) = 0333328cbb125297082b3430fccb7b01f84e176dddca7bab60a7b1f46f8aa18d +RWSagIOpLGJF3z1wiujuLtbzaShrD/73TOTcWWjm5jhAYQcJCzgh+SQAY5+DqL6Ng7aQw+RwusNGFcMcYdaj+1p00saLXs9yHQ0= +SHA256 (Pkgfile) = 0bc5b5862a1666392faa931a23329ccd101dab21e4ca234e34df8d98f2faab5d SHA256 (.footprint) = a2b93bd1352ba7adabf902b7897be3110e8fe6e686d1d8e0cb26e5995b46cf74 -SHA256 (faac-1.29.9.2.tar.gz) = d45f209d837c49dae6deebcdd87b8cc3b04ea290880358faecf5e7737740c771 +SHA256 (faac-1_30.tar.gz) = adc387ce588cca16d98c03b6ec1e58f0ffd9fc6eadb00e254157d6b16203b2d2 diff --git a/faac/Pkgfile b/faac/Pkgfile index 28263409a..571be07b0 100644 --- a/faac/Pkgfile +++ b/faac/Pkgfile @@ -4,13 +4,14 @@ # Depends on: libmp4v2 name=faac -version=1.29.9.2 +version=1.30 release=1 -source=(https://sourceforge.net/projects/$name/files/$name-src/$name-${version::4}/$name-$version.tar.gz) +source=(https://github.com/knik0/faac/archive/${version/./_}/$name-${version/./_}.tar.gz) build() { - cd $name-$version + cd $name-${version/./_} + ./bootstrap ./configure --prefix=/usr make

1 0

ports/opt (3.5): mariadb: update to 10.4.10
by crux＠crux.nu 09 Nov '19

09 Nov '19

commit 189698bed5e938a71ac91ee9193ca29df653bbe2 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Nov 9 13:49:34 2019 +0100 mariadb: update to 10.4.10 diff --git a/mariadb/.signature b/mariadb/.signature index 84fad4ef7..6331a6f19 100644 --- a/mariadb/.signature +++ b/mariadb/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WDc4iXLsJqYaTZc7Vr54DTL7zHF8TRj+HkUAXUrQOL9CO/wcgjumNjtXZD94n/U3wZq6K+KVp1aeiG3H7lCIQQ= -SHA256 (Pkgfile) = 8a2ebf73f1610818f9b88dab2cfc51feeae504f9128f2cb49d1bd7e254a1b9c9 +RWSE3ohX2g5d/foG0vZVi6bfdfzJ+Opu3kKbPYSaahqDnIqk4txf+Xhw+G5xMpg+CXwUewlpLo540erXuq1sqbAzYTiGzuhw5w0= +SHA256 (Pkgfile) = 8dd767fd62e32111f60ef5e1d3baa68bd7249b5d84748d332dc5016cf3bf55ac SHA256 (.footprint) = f5bf9804738e8468a3cc64fb750d69e2f27f61b355a7c10ad2311de6a7f009c7 -SHA256 (mariadb-10.4.8.tar.gz) = 10cc2c3bdb76733c9c6fd1e3c6c860d8b4282c85926da7d472d2a0e00fffca9b +SHA256 (mariadb-10.4.10.tar.gz) = cd50fddf86c2a47405737e342f78ebd40d5716f0fb32b976245de713bed01421 SHA256 (mariadb) = 737fe0eaad407e2b078ba21c1e4082dc4361da10354939ed4f6da651a76a8c1f SHA256 (pre-install) = 62040c17eeb3da88172d49240633c871a93c3c642ad7f61911ce2e83d8414d1c diff --git a/mariadb/Pkgfile b/mariadb/Pkgfile index 9e4e64c7c..93679935f 100644 --- a/mariadb/Pkgfile +++ b/mariadb/Pkgfile @@ -4,9 +4,9 @@ # Depends on: ncurses zlib openssl cmake libaio linux-pam name=mariadb -version=10.4.8 +version=10.4.10 release=1 -source=(https://downloads.mariadb.org/interstitial/$name-$version/source/$name-$version.tar.gz +source=(https://downloads.mariadb.com/MariaDB//$name-$version/source/$name-$version.tar.gz mariadb pre-install)

1 0

ports/compat-32 (3.5): libva-vdpau-driver-32: initial import
by crux＠crux.nu 09 Nov '19

09 Nov '19

commit d2043276654d0ee837595dbb738cc84adbe61356 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Nov 9 23:17:35 2019 +1100 libva-vdpau-driver-32: initial import diff --git a/libva-vdpau-driver-32/.32bit b/libva-vdpau-driver-32/.32bit new file mode 100644 index 0000000..e69de29 diff --git a/libva-vdpau-driver-32/.footprint b/libva-vdpau-driver-32/.footprint new file mode 100644 index 0000000..9c17c18 --- /dev/null +++ b/libva-vdpau-driver-32/.footprint @@ -0,0 +1,7 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/lib32/ +drwxr-xr-x root/root usr/lib32/dri/ +lrwxrwxrwx root/root usr/lib32/dri/nvidia_drv_video.so -> vdpau_drv_video.so +lrwxrwxrwx root/root usr/lib32/dri/s3g_drv_video.so -> vdpau_drv_video.so +-rwxr-xr-x root/root usr/lib32/dri/vdpau_drv_video.la +-rwxr-xr-x root/root usr/lib32/dri/vdpau_drv_video.so diff --git a/libva-vdpau-driver-32/.signature b/libva-vdpau-driver-32/.signature new file mode 100644 index 0000000..8179797 --- /dev/null +++ b/libva-vdpau-driver-32/.signature @@ -0,0 +1,10 @@ +untrusted comment: verify with /etc/ports/compat-32.pub +RWSwxGo/zH7eXZtC1fSOd5RDXmOlful5CTaCTCwtr1m8ef2bLpPaWSdu6pZ4LOP1G964bN9wPVZDB1arG3iVQe0jzNm2as2YKgM= +SHA256 (Pkgfile) = 32e16ae76a7085c83ed8fc0702aeb120aa4b9ac444db53c61fc35bafe5ed9158 +SHA256 (.footprint) = 37a106ebc0753ace7e8bfd8c96e7e5743edaf6952a2ca8c754d2dd28e30ba507 +SHA256 (libva-vdpau-driver-0.7.4.tar.bz2) = 155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9 +SHA256 (libva-vdpau-driver-0.7.4-glext-missing-definition.patch) = 776bfe4c101cdde396d8783029b288c6cd825d0cdbc782ca3d94a5f9ffb4558c +SHA256 (libva-vdpau-driver-0.7.4-libvdpau-0.8.patch) = 5e567b026b97dc0e207b6c05410cc1b7b77a58ceb5046801d0ea1a321cba3b9d +SHA256 (libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch) = 1ae32b8e5cca1717be4a63f09e8c6bd84a3e9b712b933816cdb32bb315dbda98 +SHA256 (libva-vdpau-driver-0.7.4-sigfpe-crash.patch) = ef21397b0ed55f170e57fa1afef42b8b491491149af09b151f97ef3cc20ed0b7 +SHA256 (libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch) = 0ddf889850c54ccace8ec61a232f04ab77495c495949f952363ad28e2fc9891d diff --git a/libva-vdpau-driver-32/Pkgfile b/libva-vdpau-driver-32/Pkgfile new file mode 100644 index 0000000..534d71b --- /dev/null +++ b/libva-vdpau-driver-32/Pkgfile @@ -0,0 +1,39 @@ +# Description: VDPAU back-end for NVIDIA and VIA chipsets. +# URL: http://freedesktop.org/wiki/Software/vaapi +# Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu +# Depends on: libva1-32 libva-vdpau-driver + +name=libva-vdpau-driver-32 +version=0.7.4 +release=6 +source=(https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/libva-vdpau-driver-$version.tar.bz2 + libva-vdpau-driver-0.7.4-glext-missing-definition.patch + libva-vdpau-driver-0.7.4-libvdpau-0.8.patch + libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch + libva-vdpau-driver-0.7.4-sigfpe-crash.patch + libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch) + +build() { + cd libva-vdpau-driver-$version + + patch -p1 -i $SRC/libva-vdpau-driver-0.7.4-glext-missing-definition.patch + patch -p1 -i $SRC/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch + patch -p1 -i $SRC/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch + patch -p1 -i $SRC/libva-vdpau-driver-0.7.4-sigfpe-crash.patch + patch -p1 -i $SRC/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch + + sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac + autoreconf -i + + PKG_CONFIG_PATH="/usr/lib32/libva1/pkgconfig" \ + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib32 \ + --enable-glx + + make + make DESTDIR=$PKG install + + mv $PKG/usr/lib32/libva1/* $PKG/usr/lib32/ + rmdir $PKG/usr/lib32/libva1 +} diff --git a/libva-vdpau-driver-32/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch b/libva-vdpau-driver-32/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch new file mode 100644 index 0000000..74caee3 --- /dev/null +++ b/libva-vdpau-driver-32/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch @@ -0,0 +1,29 @@ +>From fda3706eb74ba5ad874853969f3df3e372739c8d Mon Sep 17 00:00:00 2001 +From: "Xiang, Haihao" <haihao.xiang(a)intel.com> +Date: Fri, 21 Jun 2013 12:55:30 +0800 +Subject: [PATCH] VAEncH264VUIBufferType and VAEncH264SEIBufferType are + dropped from VA API + +The driver doesn't use them indeed + +Signed-off-by: Xiang, Haihao <haihao.xiang(a)intel.com> +--- + src/vdpau_dump.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/vdpau_dump.c b/src/vdpau_dump.c +index 899888b..610e7cd 100644 +--- a/src/vdpau_dump.c ++++ b/src/vdpau_dump.c +@@ -59,8 +59,6 @@ const char *string_of_VABufferType(VABufferType type) + _(VAEncSequenceParameterBufferType); + _(VAEncPictureParameterBufferType); + _(VAEncSliceParameterBufferType); +- _(VAEncH264VUIBufferType); +- _(VAEncH264SEIBufferType); + #endif + #if VA_CHECK_VERSION(0,31,1) + _(VAQMatrixBufferType); +-- +1.7.9.5 + diff --git a/libva-vdpau-driver-32/libva-vdpau-driver-0.7.4-glext-missing-definition.patch b/libva-vdpau-driver-32/libva-vdpau-driver-0.7.4-glext-missing-definition.patch new file mode 100644 index 0000000..b56d268 --- /dev/null +++ b/libva-vdpau-driver-32/libva-vdpau-driver-0.7.4-glext-missing-definition.patch @@ -0,0 +1,16 @@ +--- a/src/utils_glx.h~ 2012-10-05 16:02:58.000000000 +0100 ++++ b/src/utils_glx.h 2012-10-19 08:44:12.469642440 +0100 +@@ -48,6 +48,13 @@ + typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int); + #endif + ++#if GL_GLEXT_VERSION >= 85 ++/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED ++ block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h> ++ Redefine the type here as an interim solution */ ++typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); ++#endif ++ + #ifndef GL_FRAMEBUFFER_BINDING + #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT + #endif diff --git a/libva-vdpau-driver-32/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch b/libva-vdpau-driver-32/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch new file mode 100644 index 0000000..0d92074 --- /dev/null +++ b/libva-vdpau-driver-32/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/689530 + +libva commit 93c52a17b8d2 ("va_backend: remove unneeded +linux/videodev2.h include") removed an include that provided the +prototype of v4l2_format among other v4l2_* structs. + +Without this or a forward declaration of 'struct v4l2_format', the prototype +and definition of vdpau_CreateSurfaceFromV4L2Buf() (which has a 'struct +v4l2_format *' parameter) are seen as conflicting. + +Just include the removed header where we need it. + +diff --git a/src/vdpau_driver.h b/src/vdpau_driver.h +index 6286d16..54d37fb 100644 +--- a/src/vdpau_driver.h ++++ b/src/vdpau_driver.h +@@ -21,6 +21,8 @@ + #ifndef VDPAU_DRIVER_H + #define VDPAU_DRIVER_H + ++#include <linux/videodev2.h> ++ + #include <va/va_backend.h> + #include "vaapi_compat.h" + #include "vdpau_gate.h" diff --git a/libva-vdpau-driver-32/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch b/libva-vdpau-driver-32/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch new file mode 100644 index 0000000..ab3a479 --- /dev/null +++ b/libva-vdpau-driver-32/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch @@ -0,0 +1,11 @@ +--- a/src/vdpau_decode.c ++++ b/src/vdpau_decode.c +@@ -1289,7 +1289,7 @@ + driver_data, + obj_context->vdp_decoder, + obj_surface->vdp_surface, +- (VdpPictureInfo)&obj_context->vdp_picture_info, ++ (VdpPictureInfo *)&obj_context->vdp_picture_info, + obj_context->vdp_bitstream_buffers_count, + obj_context->vdp_bitstream_buffers + ); diff --git a/libva-vdpau-driver-32/libva-vdpau-driver-0.7.4-sigfpe-crash.patch b/libva-vdpau-driver-32/libva-vdpau-driver-0.7.4-sigfpe-crash.patch new file mode 100644 index 0000000..e2fe02c --- /dev/null +++ b/libva-vdpau-driver-32/libva-vdpau-driver-0.7.4-sigfpe-crash.patch @@ -0,0 +1,21 @@ +Description: Fix a crash if a heap is destroyed before being initialized +Author: Sebastian Ramacher <sramacher(a)debian.org> +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=58836 +Bug-Debian: http://bugs.debian.org/748294 +Last-Update: 2014-06-02 + +--- vdpau-video-0.7.4.orig/src/object_heap.c ++++ vdpau-video-0.7.4/src/object_heap.c +@@ -272,8 +272,10 @@ object_heap_destroy(object_heap_p heap) + ASSERT(obj->next_free != ALLOCATED); + } + +- for (i = 0; i < heap->heap_size / heap->heap_increment; i++) { +- free(heap->bucket[i]); ++ if (heap->bucket) { ++ for (i = 0; i < heap->heap_size / heap->heap_increment; i++) { ++ free(heap->bucket[i]); ++ } + } + + pthread_mutex_destroy(&heap->mutex);

1 0

ports/compat-32 (3.5): libva1-32: fix path for headers
by crux＠crux.nu 09 Nov '19

09 Nov '19

commit 8edaa2bb896e013bb1d85c45985ddfad31028bad Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Nov 9 23:14:44 2019 +1100 libva1-32: fix path for headers diff --git a/libva1-32/.signature b/libva1-32/.signature index e999207..be59fb6 100644 --- a/libva1-32/.signature +++ b/libva1-32/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXdVQvUMqcYDiYoNcvNc4SpSkIJTjyT52AbvYd2iSvSvTxPTAYUXtuG0Bge4/ic+Xa28bwfDe2IUtF/PHrt9C2wQ= -SHA256 (Pkgfile) = 8504225eeaa747bb8d6586867294b824aa90971045936b2a9c3e47a241f14086 +RWSwxGo/zH7eXaNQqRVNXITCcJo2HJWH85v7akzb2C2NEAscs3gXE3fGfz741k0n1vFmklHtWXDrw/YwmijxdizfHIaIrcb3RwY= +SHA256 (Pkgfile) = c538a5889c11061fc2b959be272d084d013279ac0d2b667ca08afe60f204fd9d SHA256 (.footprint) = c12a46590357e9a6acc30c878508fa5fe64900b15a3f2074833cd6aed23ea020 SHA256 (libva-1.8.3.tar.bz2) = 56ee129deba99b06eb4a8d4f746b117c5d1dc2ec5b7a0bfc06971fca1598ab9b SHA256 (libva1-32.conf) = ff058ef83ef162005bd0b6525334ff76beb5c38d775834e3fc86def2eb30f46f diff --git a/libva1-32/Pkgfile b/libva1-32/Pkgfile index 03df2b4..031a429 100644 --- a/libva1-32/Pkgfile +++ b/libva1-32/Pkgfile @@ -5,7 +5,7 @@ name=libva1-32 version=1.8.3 -release=1 +release=2 source=(https://github.com/intel/libva/releases/download/$version/libva-$ve… libva1-32.conf) @@ -15,7 +15,9 @@ build() { ./configure \ --prefix=/usr \ --libdir=/usr/lib32/libva1 \ - --with-drivers-path='/usr/lib32/libva1/dri' + --includedir=/usr/include/libva1 \ + --with-drivers-path='/usr/lib32/libva1/dri' \ + --disable-va-messaging make make DESTDIR=$PKG install

1 0

ports/contrib (3.5): inkscape: fix for poppler 0.82.x
by crux＠crux.nu 09 Nov '19

09 Nov '19

commit dc0a43457b5ca066c78ef82a6c94d410d3a9f9fd Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Nov 9 22:05:10 2019 +1100 inkscape: fix for poppler 0.82.x diff --git a/inkscape/.signature b/inkscape/.signature index fb00bba52..67190d971 100644 --- a/inkscape/.signature +++ b/inkscape/.signature @@ -1,6 +1,8 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31eKlzOW5oKcRe5fL/Tn7UAD6eT6umizECSach72pIb5Nq3/DGkO71BakKY1vH5yk1fl2cTXlrbuKDcOSCVy3ww= -SHA256 (Pkgfile) = af496c0ea0e5534258f22b7acee0b008cf6163dc2d9bb35f95bc4d47944121b7 +RWSagIOpLGJF3xGbhwh7p1bdsxBeBh6A0U26SBVwP0XjBM7iu9yuXmc6mtXmVfY3hGydiqWwI2DV5JfBYd51h98IuThMrhuLKg4= +SHA256 (Pkgfile) = ed26e11e2b982632207e4a3e4235f62d9e35fd326e4bf9b89ba794769429c957 SHA256 (.footprint) = a231855b77d8603f16e2a8754074e97f6c430bf80ac8ccaa02b35814f2f4db2b SHA256 (inkscape-0.92.4.tar.bz2) = 57ec2da8177b36614a513e2822efd73af721e690f7ddc6bd0a5fbb1525b4515e -SHA256 (inkscape-0.92.4-poppler-0.76.0.patch) = 3c476cccaa12d962d13e446da4075e821980a883f2be8dac0ec9ae2061926d6a +SHA256 (inkscape-0.92.4-poppler_0_82_0_fixes-1.patch) = 0c35bc0be8d681531233b43123c11bd6d375e8d780b9b78b5ca018c6ae61484e +SHA256 (inkscape-0.92.4-use_versioned_ImageMagick6-1.patch) = 7f0e401e359285590f545c1b1225ec98682922d2f82e805c722c2f086be28c4c +SHA256 (inkscape-0.92.4-upstream_fixes-1.patch) = 6932d7f140ba0ee4992bdea165f94854a3114d9eac190b7003b18af7f6cf7341 diff --git a/inkscape/Pkgfile b/inkscape/Pkgfile index 3a5be3747..e86315a4f 100644 --- a/inkscape/Pkgfile +++ b/inkscape/Pkgfile @@ -6,14 +6,22 @@ name=inkscape version=0.92.4 -release=1 +release=2 source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.bz2 - inkscape-0.92.4-poppler-0.76.0.patch) + inkscape-0.92.4-poppler_0_82_0_fixes-1.patch + inkscape-0.92.4-use_versioned_ImageMagick6-1.patch + inkscape-0.92.4-upstream_fixes-1.patch) build() { cd $name-$version - patch -p1 -i $SRC/inkscape-0.92.4-poppler-0.76.0.patch + # fix a problem introduced by Poppler-0.76.1 + sed -e 's|new Lexer(xref, obj)|obj|g' -i src/extension/internal/pdfinput/pdf-parser.cpp + + patch -p1 -i $SRC/inkscape-0.92.4-poppler_0_82_0_fixes-1.patch + patch -p1 -i $SRC/inkscape-0.92.4-use_versioned_ImageMagick6-1.patch + patch -p1 -i $SRC/inkscape-0.92.4-upstream_fixes-1.patch + CXXFLAGS+=' -std=c++11' @@ -29,8 +37,7 @@ build() { --with-perl \ --enable-lcms \ --enable-poppler-cairo \ - --disable-strict-build \ - --disable-dependency-tracking + --disable-strict-build make make DESTDIR=$PKG install diff --git a/inkscape/inkscape-0.92.4-poppler-0.76.0.patch b/inkscape/inkscape-0.92.4-poppler-0.76.0.patch deleted file mode 100644 index 11383d9aa..000000000 --- a/inkscape/inkscape-0.92.4-poppler-0.76.0.patch +++ /dev/null @@ -1,44 +0,0 @@ -From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001 -From: Marc Jeanmougin <marc(a)jeanmougin.fr> -Date: Wed, 24 Apr 2019 14:11:26 +0200 -Subject: [PATCH] Tentative fix for poppler 0.76 - ---- - src/extension/internal/pdfinput/pdf-parser.cpp | 2 +- - src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index 2981d6ee51..ddbff7671f 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { - error(errInternal, -1, "Weird page contents"); - return; - } -- parser = new Parser(xref, new Lexer(xref, obj), gFalse); -+ parser = new _POPPLER_NEW_PARSER(xref, obj); - go(topLevel); - delete parser; - parser = NULL; -diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h -index 6e4dde7dee..21a60702fa 100644 ---- a/src/extension/internal/pdfinput/poppler-transition-api.h -+++ b/src/extension/internal/pdfinput/poppler-transition-api.h -@@ -3,6 +3,13 @@ - - #include <glib/poppler-features.h> - -+#if POPPLER_CHECK_VERSION(0, 76, 0) -+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) -+#else -+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) -+#endif -+ -+ - #if POPPLER_CHECK_VERSION(0, 72, 0) - #define getCString c_str - #endif --- -2.18.1 - diff --git a/inkscape/inkscape-0.92.4-poppler_0_82_0_fixes-1.patch b/inkscape/inkscape-0.92.4-poppler_0_82_0_fixes-1.patch new file mode 100644 index 000000000..61c568eac --- /dev/null +++ b/inkscape/inkscape-0.92.4-poppler_0_82_0_fixes-1.patch @@ -0,0 +1,63 @@ +Submitted By: Douglas R. Reno <renodr at linuxfromscratch dot org> +Date: 2019-10-28 +Initial Package Version: 0.92.4 +Origin: Upstream (https://gitlab.com/inkscape/inkscape/merge_requests/986) +Upstream Status: Applied +Description: Adjusts the usage of the poppler-glib API to use a + const int instead of a standard int, since the + data types are incompatible and causes a build failure. + This required modification to the SVG Builder and + PDF Parser. + +diff -Naurp inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp +--- inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp 2019-01-14 22:29:27.000000000 -0600 ++++ inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp 2019-10-28 09:54:48.488255747 -0500 +@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) + int wMode; + double riseX, riseY; + CharCode code; +- Unicode *u = NULL; ++ Unicode _POPPLER_CONST_82 *u = NULL; + double x, y, dx, dy, tdx, tdy; + double originX, originY, tOriginX, tOriginY; + double oldCTM[6], newCTM[6]; +diff -Naurp inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h +--- inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h 2019-01-14 22:29:27.000000000 -0600 ++++ inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h 2019-10-28 09:55:37.586507369 -0500 +@@ -3,6 +3,12 @@ + + #include <glib/poppler-features.h> + ++#if POPPLER_CHECK_VERSION(0, 82, 0) ++#define _POPPLER_CONST_82 const ++#else ++#define _POPPLER_CONST_82 ++#endif ++ + #if POPPLER_CHECK_VERSION(0, 72, 0) + #define getCString c_str + #endif +diff -Naurp inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp +--- inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp 2019-01-14 22:29:27.000000000 -0600 ++++ inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp 2019-10-28 09:56:03.815112158 -0500 +@@ -1379,7 +1379,7 @@ void SvgBuilder::beginString(GfxState *s + void SvgBuilder::addChar(GfxState *state, double x, double y, + double dx, double dy, + double originX, double originY, +- CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) { ++ CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) { + + + bool is_space = ( uLen == 1 && u[0] == 32 ); +diff -Naurp inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.h inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.h +--- inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.h 2019-01-14 22:29:27.000000000 -0600 ++++ inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.h 2019-10-28 09:56:25.743784036 -0500 +@@ -141,7 +141,7 @@ public: + void addChar(GfxState *state, double x, double y, + double dx, double dy, + double originX, double originY, +- CharCode code, int nBytes, Unicode *u, int uLen); ++ CharCode code, int nBytes, Unicode const *u, int uLen); + void beginTextObject(GfxState *state); + void endTextObject(GfxState *state); + diff --git a/inkscape/inkscape-0.92.4-upstream_fixes-1.patch b/inkscape/inkscape-0.92.4-upstream_fixes-1.patch new file mode 100644 index 000000000..81aaa2420 --- /dev/null +++ b/inkscape/inkscape-0.92.4-upstream_fixes-1.patch @@ -0,0 +1,96 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2019-06-25 +Initial Package Version: 0.92.4 +Upstream Status: Applied +Origin: Upstream +Description: Fixes for out of bounds accesses in the fill bucket and text tools. +These issues are highlighted if -D_FORTIFY_SOURCE=2 is used (e.g. application +terminated when trying to use the fill tool). + +commit 19225039b8667679c175e62f1faa29495b4ed547 +Author: Nathan Lee <2431820-nathanal(a)users.noreply.gitlab.com> +Date: Fri Apr 26 00:30:04 2019 +1000 + + Add out of bound checks to fill bucket + + Fixes https://gitlab.com/inkscape/inbox/issues/398 + +commit 37a5a0e7f1e0303222e6349379a6943c60f3b5b8 +Author: Trevor Spiteri <trevor.spiteri(a)um.edu.mt> +Date: Tue Jan 15 18:57:17 2019 +0100 + + out-of-bounds access on Enter in new text field + + https://bugzilla.redhat.com/show_bug.cgi?id=1575842 + + Reproduce using: + 1. Select text tool (F8) + 2. Click on empty canvas + 3. Hit Enter + +commit 6b8b86ca248cc47128ee3646d7ce17d2c0720522 +Author: Trevor Spiteri <trevor.spiteri(a)um.edu.mt> +Date: Tue Jan 15 18:57:56 2019 +0100 + + out-of-bounds access on clicking at end of text field + + https://bugzilla.redhat.com/show_bug.cgi?id=1608371 + https://bugs.launchpad.net/inkscape/+bug/1803553 + + Reproduce using: + 1. Select text tool (F8) + 2. Click on empty canvas + 3. Type "abc" + 4. Click somewhere else + 5. Click in first text field after "c" in "abc" + +diff -Naur a/src/libnrtype/Layout-TNG-OutIter.cpp b/src/libnrtype/Layout-TNG-OutIter.cpp +--- a/src/libnrtype/Layout-TNG-OutIter.cpp 2019-01-15 04:29:27.000000000 +0000 ++++ b/src/libnrtype/Layout-TNG-OutIter.cpp 2019-06-25 18:55:33.680796467 +0100 +@@ -46,7 +46,10 @@ + best_x_difference = this_x_difference; + } + } +- if (best_char_index == -1) return iterator(this, char_index); ++ if (best_char_index == -1) ++ best_char_index = char_index; ++ if (best_char_index == _characters.size()) ++ return end(); + return iterator(this, best_char_index); + } + +@@ -182,6 +185,8 @@ + if (_input_stream[source_index]->Type() != TEXT_SOURCE) + return iterator(this, char_index); + ++ if (char_index >= _characters.size()) ++ return end(); + return iterator(this, char_index); + /* This code was never used, the text_iterator argument was "NULL" in all calling code + InputStreamTextSource const *text_source = static_cast<InputStreamTextSource const *>(_input_stream[source_index]); +diff -Naur a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp +--- a/src/ui/tools/flood-tool.cpp 2019-01-15 04:29:27.000000000 +0000 ++++ b/src/ui/tools/flood-tool.cpp 2019-06-25 18:55:14.064888807 +0100 +@@ -630,7 +630,7 @@ + bool can_paint_top = (top_ty > 0); + bool can_paint_bottom = (bottom_ty < bci.height); + +- Geom::Point t = fill_queue->front(); ++ Geom::Point front_of_queue = fill_queue->empty() ? Geom::Point() : fill_queue->front(); + + do { + ok = false; +@@ -648,8 +648,11 @@ + paint_directions = paint_pixel(px, trace_px, orig_color, bci, current_trace_t); + if (bci.radius == 0) { + mark_pixel_checked(current_trace_t); +- if ((t[Geom::X] == bci.x) && (t[Geom::Y] == bci.y)) { +- fill_queue->pop_front(); t = fill_queue->front(); ++ if ((!fill_queue->empty()) && ++ (front_of_queue[Geom::X] == bci.x) && ++ (front_of_queue[Geom::Y] == bci.y)) { ++ fill_queue->pop_front(); ++ front_of_queue = fill_queue->empty() ? Geom::Point() : fill_queue->front(); + } + } + diff --git a/inkscape/inkscape-0.92.4-use_versioned_ImageMagick6-1.patch b/inkscape/inkscape-0.92.4-use_versioned_ImageMagick6-1.patch new file mode 100644 index 000000000..d2ed42539 --- /dev/null +++ b/inkscape/inkscape-0.92.4-use_versioned_ImageMagick6-1.patch @@ -0,0 +1,33 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2017-01-09 +Initial Package Version: 0.92.0 +Upstream Status: N/A +Origin: Self +Description: Look for verisioned ImageMagick-6 pkgconfig files so that +ImageMagick-6 libraries and be installed alongside a full ImageMagick-7. +This requires a patched build of ImageMagick-6. + +diff -Naur inkscape-0.92.0.orig/CMakeScripts/DefineDependsandFlags.cmake inkscape-0.92.0/CMakeScripts/DefineDependsandFlags.cmake +--- inkscape-0.92.0.orig/CMakeScripts/DefineDependsandFlags.cmake 2017-01-02 09:44:59.000000000 +0000 ++++ inkscape-0.92.0/CMakeScripts/DefineDependsandFlags.cmake 2017-01-08 03:03:50.171286138 +0000 +@@ -373,14 +373,14 @@ + list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES}) + + if(WITH_IMAGE_MAGICK) +- pkg_check_modules(ImageMagick ImageMagick MagickCore Magick++ ) +- if(ImageMagick_FOUND) ++ pkg_check_modules(ImageMagick-6 ImageMagick-6 MagickCore-6 Magick++-6 ) ++ if(ImageMagick-6_FOUND) + +- list(APPEND INKSCAPE_LIBS ${ImageMagick_LDFLAGS}) +- add_definitions(${ImageMagick_CFLAGS_OTHER}) ++ list(APPEND INKSCAPE_LIBS ${ImageMagick-6_LDFLAGS}) ++ add_definitions(${ImageMagick-6_CFLAGS_OTHER}) + +- list(APPEND INKSCAPE_INCS_SYS ${ImageMagick_INCLUDE_DIRS}) +- list(APPEND INKSCAPE_LIBS ${ImageMagick_LIBRARIES}) ++ list(APPEND INKSCAPE_INCS_SYS ${ImageMagick-6_INCLUDE_DIRS}) ++ list(APPEND INKSCAPE_LIBS ${ImageMagick-6_LIBRARIES}) + else() + set(WITH_IMAGE_MAGICK OFF) # enable 'Extensions > Raster' + endif()

1 0

ports/compat-32 (3.5): faudio-32: 19.10 -> 19.11
by crux＠crux.nu 09 Nov '19

09 Nov '19

commit dbbd5ebd52417912cb0344b4becc43156ba15ce9 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Nov 9 20:40:37 2019 +1100 faudio-32: 19.10 -> 19.11 diff --git a/faudio-32/.footprint b/faudio-32/.footprint index c8f2620..0e24ba8 100644 --- a/faudio-32/.footprint +++ b/faudio-32/.footprint @@ -6,5 +6,5 @@ drwxr-xr-x root/root usr/lib32/cmake/FAudio/ -rw-r--r-- root/root usr/lib32/cmake/FAudio/FAudio-targets-release.cmake -rw-r--r-- root/root usr/lib32/cmake/FAudio/FAudio-targets.cmake lrwxrwxrwx root/root usr/lib32/libFAudio.so -> libFAudio.so.0 -lrwxrwxrwx root/root usr/lib32/libFAudio.so.0 -> libFAudio.so.0.19.10 --rwxr-xr-x root/root usr/lib32/libFAudio.so.0.19.10 +lrwxrwxrwx root/root usr/lib32/libFAudio.so.0 -> libFAudio.so.0.19.11 +-rwxr-xr-x root/root usr/lib32/libFAudio.so.0.19.11 diff --git a/faudio-32/.signature b/faudio-32/.signature index 7cc3b3b..eeaf954 100644 --- a/faudio-32/.signature +++ b/faudio-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXb4+NrTlH62CaOjJspdqWpcPrhmcAIXtMQz3DL2NMeX0INOkAuhzPz02Z5USqVk9xRHgwZQvVqbIyzmFLFHxyQE= -SHA256 (Pkgfile) = 508177b103dba66d7125332399ab174d07f3e1c63e11dd8d2e0226230a8db6fc -SHA256 (.footprint) = bc3ca727574751fcc24392bd0036ee5ff86f4291d355e14d812ba0def3fc2001 -SHA256 (faudio-32-19.10.tar.gz) = 98bc55b494ac5249a4eed13b77394fa30bd9dac0931d4364616d2e501d987457 +RWSwxGo/zH7eXW9/gQuvbjS66SbXXymOEwWr4gpYpURLyYF/qwfUfJdbkbilYLXQk8OuifT2E3jMrBA32LIz0k7sByd08IlRxw8= +SHA256 (Pkgfile) = 3b4c79e17954021c0a9dc42005aae6e9fa276bb3d0dc37589c556cd09e2bc103 +SHA256 (.footprint) = 75397b8d6750761fa07b5e037f8fedd407eb75a6dd6d099f87e619678aaeb4e2 +SHA256 (faudio-32-19.11.tar.gz) = 1bdc6e4e1765634f9293e0667454bafd31d2fe2b761f0b34e20438dd28803e08 diff --git a/faudio-32/Pkgfile b/faudio-32/Pkgfile index 97626cf..7275272 100644 --- a/faudio-32/Pkgfile +++ b/faudio-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libsdl2-32 faudio name=faudio-32 -version=19.10 +version=19.11 release=1 source=(https://github.com/FNA-XNA/FAudio/archive/$version/$name-$version.t…

1 0

ports/contrib (3.5): gcr: 3.28.1 -> 3.34.0
by crux＠crux.nu 09 Nov '19

09 Nov '19

commit 5bc828457c0ed1b013ad19708f85fdb375099e8c Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Nov 9 20:15:15 2019 +1100 gcr: 3.28.1 -> 3.34.0 diff --git a/gcr/.signature b/gcr/.signature index 0fa7b5ea3..2ccd2c2ca 100644 --- a/gcr/.signature +++ b/gcr/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3w1Y35LaWCCX9OmObOxUFjsC2DhMOx0vwrKO5a1tWJ6Claxfq8h1MWgiWU9sUJpRN9UcJrsfkzFsIVK/olv1Zgk= -SHA256 (Pkgfile) = f4fa97ab251864e1d2733654925195953032083057a0d8d3894af14e971e866b +RWSagIOpLGJF34+RNTznhtaX06lrrg96/48NvnlOqB3yC8LsLA8cgH72v7nDzAVOUkqpTVy17PZL+NdwRAx62tPfb72nsx/5Xgo= +SHA256 (Pkgfile) = adff4058c28d3a13ed89ea6d128c975006715e474252e6be285801fa9443399a SHA256 (.footprint) = cc04ed14b619adae4b650295c1ba452974007f1486c98f87062d2e73c92310ef -SHA256 (gcr-3.28.1.tar.xz) = 95204aa2111c301778ebfbe60975ce3ed698c958430ffcc2a785ac5e593d168b +SHA256 (gcr-3.34.0.tar.xz) = 29df50974a90987af694c0fb8926a6b366e68cacd8abd813817cfe1eb5d54524 diff --git a/gcr/Pkgfile b/gcr/Pkgfile index 962bdb8d4..7675bd4ae 100644 --- a/gcr/Pkgfile +++ b/gcr/Pkgfile @@ -1,10 +1,10 @@ # Description: Libraries for cryptographic UIs and accessing PKCS#11 modules. # URL: https://developer.gnome.org/gcr/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: gnupg gtk3 p11-kit util-linux vala xorg-libxcomposite xorg-libxcursor xorg-libxinerama +# Depends on: gnupg gtk3 p11-kit vala xorg-libxcomposite xorg-libxcursor xorg-libxinerama name=gcr -version=3.28.1 +version=3.34.0 release=1 source=(https://download.gnome.org/sources/$name/${version:0:4}/$name-$vers… @@ -16,11 +16,12 @@ build() { --libexecdir=/usr/lib/gcr \ --disable-update-icon-cache \ --disable-update-mime \ + --disable-gtk-doc \ --disable-nls sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make make DESTDIR=$PKG install - rm -r $PKG/usr/share/{locale,gtk-doc} + rm -r $PKG/usr/share/gtk-doc }

1 0