March 2018 - crux-commits

ports/opt (3.4): libxklavier: adopted, updated to version 5.4
by crux＠crux.nu 30 Mar '18

30 Mar '18

commit 81a959305c1379b1523c4f6eb26c873facb3d20f Author: Matt Housh <jaeger(a)crux.ninja> Date: Thu Mar 29 23:20:06 2018 -0500 libxklavier: adopted, updated to version 5.4 diff --git a/libxklavier/.footprint b/libxklavier/.footprint index 0d21a29dd..ce5db9517 100644 --- a/libxklavier/.footprint +++ b/libxklavier/.footprint @@ -12,8 +12,11 @@ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/Xkl-1.0.typelib -rwxr-xr-x root/root usr/lib/libxklavier.la -lrwxrwxrwx root/root usr/lib/libxklavier.so -> libxklavier.so.16.3.0 -lrwxrwxrwx root/root usr/lib/libxklavier.so.16 -> libxklavier.so.16.3.0 --rwxr-xr-x root/root usr/lib/libxklavier.so.16.3.0 +lrwxrwxrwx root/root usr/lib/libxklavier.so -> libxklavier.so.16.4.0 +lrwxrwxrwx root/root usr/lib/libxklavier.so.16 -> libxklavier.so.16.4.0 +-rwxr-xr-x root/root usr/lib/libxklavier.so.16.4.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libxklavier.pc +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/gir-1.0/ +-rw-r--r-- root/root usr/share/gir-1.0/Xkl-1.0.gir diff --git a/libxklavier/.md5sum b/libxklavier/.md5sum index 25ed7a805..f4a5a15ad 100644 --- a/libxklavier/.md5sum +++ b/libxklavier/.md5sum @@ -1 +1 @@ -290ea2a8abc40f78a3a16bdae6f02808 libxklavier-5.3.tar.xz +13af74dcb6011ecedf1e3ed122bd31fa libxklavier-5.4.tar.bz2 diff --git a/libxklavier/.signature b/libxklavier/.signature index c221c13a8..72c5cb433 100644 --- a/libxklavier/.signature +++ b/libxklavier/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SQscxMONw0czw94ocDsIMZMbyEkpV2SLDyJjWVwnqvVm9qApOFaRqMAVRIg9MaCz2Sh0ol0uHwNGbO5r2vBjw8= -SHA256 (Pkgfile) = 299f37f3ce4edad5978111f7a53e934d1649c6519cbbb9f2093ea89a0c7d0893 -SHA256 (.footprint) = 63d45e10407e15e52133ab7868acd6ebb146a00e6c5d0a7135b250b91828015e -SHA256 (libxklavier-5.3.tar.xz) = ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404 +RWSE3ohX2g5d/a0XoJpkZYTiNoPykTPR2wtlJ0zqDf0mPJp+9t5qwcMSSVnCjRlMbY7d0O82F5+us5Jc3zt2rd0wrAD+0nuJ7gE= +SHA256 (Pkgfile) = 6e0d6f76b9ad53032fb24cabe6403ab5dc4a43eba7005c0206e4eac71a7fbee6 +SHA256 (.footprint) = 84689636040d102794769b607d4d85b71aff1cd8014f794dbb0e0a0dfd0d13ec +SHA256 (libxklavier-5.4.tar.bz2) = 17a34194df5cbcd3b7bfd0f561d95d1f723aa1c87fca56bc2c209514460a9320 diff --git a/libxklavier/Pkgfile b/libxklavier/Pkgfile index 9c1d6e608..98c7c9289 100644 --- a/libxklavier/Pkgfile +++ b/libxklavier/Pkgfile @@ -1,22 +1,19 @@ -# Description: utility library for X keyboard-related projects +# Description: A library providing high-level API for X Keyboard Extension known as XKB # URL: http://freedesktop.org/Software/LibXklavier -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: Matt Housh, jaeger at morpheus dot net -# Depends on: gobject-introspection iso-codes xkeyboard-config xorg-server xorg-xinput +# Maintainer: Matt Housh, jaeger at crux dot ninja +# Depends on: xorg-libx11 iso-codes gobject-introspection name=libxklavier -version=5.3 +version=5.4 release=1 -source=(http://download.gnome.org/sources/$name/$version/$name-$version.tar.xz) +source=(https://people.freedesktop.org/~svu/$name-$version.tar.bz2) build() { cd $name-$version - + sed -i -e '/^SUBDIRS/s/ doc//' Makefile.in ./configure --prefix=/usr \ - --disable-static - + --disable-static \ + --disable-nls make make DESTDIR=$PKG install - - rm -rf $PKG/usr/share }

1 0

ports/opt (3.4): gst-plugins-base: 1.12.4 -> 1.14.0
by crux＠crux.nu 30 Mar '18

30 Mar '18

commit e7f4fd90f1b07b54470f6a48585ae6c1752827d8 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Mar 30 12:59:50 2018 +1100 gst-plugins-base: 1.12.4 -> 1.14.0 diff --git a/gst-plugins-base/.footprint b/gst-plugins-base/.footprint index 314ad7d61..e14e262c5 100644 --- a/gst-plugins-base/.footprint +++ b/gst-plugins-base/.footprint @@ -7,11 +7,14 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/gstreamer-1.0/ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/allocators/ +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/allocators/allocators-prelude.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/allocators/allocators.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/allocators/gstdmabuf.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/allocators/gstfdmemory.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/allocators/gstphysmemory.h drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/app/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/app/app-enumtypes.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/app/app-prelude.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/app/app.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/app/gstappsink.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/app/gstappsrc.h @@ -22,9 +25,11 @@ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/audio/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/audio-enumtypes.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/audio-format.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/audio-info.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/audio-prelude.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/audio-quantize.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/audio-resampler.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/audio.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/gstaudioaggregator.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/gstaudiobasesink.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/gstaudiobasesrc.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/gstaudiocdsrc.h @@ -37,8 +42,10 @@ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/audio/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/gstaudioringbuffer.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/gstaudiosink.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/gstaudiosrc.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/gstaudiostreamalign.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/audio/streamvolume.h drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/fft/ +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/fft/fft-prelude.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/fft/fft.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/fft/gstfft.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/fft/gstfftf32.h @@ -56,10 +63,12 @@ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/pbutils/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/pbutils/install-plugins.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/pbutils/missing-plugins.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/pbutils/pbutils-enumtypes.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/pbutils/pbutils-prelude.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/pbutils/pbutils.h drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/riff/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/riff/riff-ids.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/riff/riff-media.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/riff/riff-prelude.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/riff/riff-read.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/riff/riff.h drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/rtp/ @@ -72,6 +81,7 @@ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/rtp/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/rtp/gstrtpdefs.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/rtp/gstrtphdrext.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/rtp/gstrtppayloads.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/rtp/rtp-prelude.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/rtp/rtp.h drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/rtsp/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/rtsp/gstrtsp-enumtypes.h @@ -83,16 +93,19 @@ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/rtsp/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/rtsp/gstrtsprange.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/rtsp/gstrtsptransport.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/rtsp/gstrtspurl.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/rtsp/rtsp-prelude.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/rtsp/rtsp.h drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/sdp/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/sdp/gstmikey.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/sdp/gstsdp.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/sdp/gstsdpmessage.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/sdp/sdp-prelude.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/sdp/sdp.h drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/tag/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/tag/gsttagdemux.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/tag/gsttagmux.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/tag/tag-enumtypes.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/tag/tag-prelude.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/tag/tag.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/tag/xmpwriter.h drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/video/ @@ -120,6 +133,7 @@ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/video/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/video/video-info.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/video/video-multiview.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/video/video-overlay-composition.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/video/video-prelude.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/video/video-resampler.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/video/video-scaler.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/video/video-tile.h @@ -132,7 +146,6 @@ drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/GstAllocators-1.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/GstApp-1.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/GstAudio-1.0.typelib --rw-r--r-- root/root usr/lib/girepository-1.0/GstFft-1.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/GstPbutils-1.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/GstRtp-1.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/GstRtsp-1.0.typelib @@ -148,6 +161,8 @@ drwxr-xr-x root/root usr/lib/gstreamer-1.0/ -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstapp.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstaudioconvert.la -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstaudioconvert.so +-rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstaudiomixer.la +-rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstaudiomixer.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstaudiorate.la -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstaudiorate.so -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstaudioresample.la @@ -197,49 +212,49 @@ drwxr-xr-x root/root usr/lib/gstreamer-1.0/ -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstxvimagesink.la -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstxvimagesink.so -rwxr-xr-x root/root usr/lib/libgstallocators-1.0.la -lrwxrwxrwx root/root usr/lib/libgstallocators-1.0.so -> libgstallocators-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgstallocators-1.0.so.0 -> libgstallocators-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgstallocators-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgstallocators-1.0.so -> libgstallocators-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgstallocators-1.0.so.0 -> libgstallocators-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgstallocators-1.0.so.0.1400.0 -rwxr-xr-x root/root usr/lib/libgstapp-1.0.la -lrwxrwxrwx root/root usr/lib/libgstapp-1.0.so -> libgstapp-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgstapp-1.0.so.0 -> libgstapp-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgstapp-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgstapp-1.0.so -> libgstapp-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgstapp-1.0.so.0 -> libgstapp-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgstapp-1.0.so.0.1400.0 -rwxr-xr-x root/root usr/lib/libgstaudio-1.0.la -lrwxrwxrwx root/root usr/lib/libgstaudio-1.0.so -> libgstaudio-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgstaudio-1.0.so.0 -> libgstaudio-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgstaudio-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgstaudio-1.0.so -> libgstaudio-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgstaudio-1.0.so.0 -> libgstaudio-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgstaudio-1.0.so.0.1400.0 -rwxr-xr-x root/root usr/lib/libgstfft-1.0.la -lrwxrwxrwx root/root usr/lib/libgstfft-1.0.so -> libgstfft-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgstfft-1.0.so.0 -> libgstfft-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgstfft-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgstfft-1.0.so -> libgstfft-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgstfft-1.0.so.0 -> libgstfft-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgstfft-1.0.so.0.1400.0 -rwxr-xr-x root/root usr/lib/libgstpbutils-1.0.la -lrwxrwxrwx root/root usr/lib/libgstpbutils-1.0.so -> libgstpbutils-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgstpbutils-1.0.so.0 -> libgstpbutils-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgstpbutils-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgstpbutils-1.0.so -> libgstpbutils-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgstpbutils-1.0.so.0 -> libgstpbutils-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgstpbutils-1.0.so.0.1400.0 -rwxr-xr-x root/root usr/lib/libgstriff-1.0.la -lrwxrwxrwx root/root usr/lib/libgstriff-1.0.so -> libgstriff-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgstriff-1.0.so.0 -> libgstriff-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgstriff-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgstriff-1.0.so -> libgstriff-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgstriff-1.0.so.0 -> libgstriff-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgstriff-1.0.so.0.1400.0 -rwxr-xr-x root/root usr/lib/libgstrtp-1.0.la -lrwxrwxrwx root/root usr/lib/libgstrtp-1.0.so -> libgstrtp-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgstrtp-1.0.so.0 -> libgstrtp-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgstrtp-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgstrtp-1.0.so -> libgstrtp-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgstrtp-1.0.so.0 -> libgstrtp-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgstrtp-1.0.so.0.1400.0 -rwxr-xr-x root/root usr/lib/libgstrtsp-1.0.la -lrwxrwxrwx root/root usr/lib/libgstrtsp-1.0.so -> libgstrtsp-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgstrtsp-1.0.so.0 -> libgstrtsp-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgstrtsp-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgstrtsp-1.0.so -> libgstrtsp-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgstrtsp-1.0.so.0 -> libgstrtsp-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgstrtsp-1.0.so.0.1400.0 -rwxr-xr-x root/root usr/lib/libgstsdp-1.0.la -lrwxrwxrwx root/root usr/lib/libgstsdp-1.0.so -> libgstsdp-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgstsdp-1.0.so.0 -> libgstsdp-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgstsdp-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgstsdp-1.0.so -> libgstsdp-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgstsdp-1.0.so.0 -> libgstsdp-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgstsdp-1.0.so.0.1400.0 -rwxr-xr-x root/root usr/lib/libgsttag-1.0.la -lrwxrwxrwx root/root usr/lib/libgsttag-1.0.so -> libgsttag-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgsttag-1.0.so.0 -> libgsttag-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgsttag-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgsttag-1.0.so -> libgsttag-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgsttag-1.0.so.0 -> libgsttag-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgsttag-1.0.so.0.1400.0 -rwxr-xr-x root/root usr/lib/libgstvideo-1.0.la -lrwxrwxrwx root/root usr/lib/libgstvideo-1.0.so -> libgstvideo-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgstvideo-1.0.so.0 -> libgstvideo-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgstvideo-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgstvideo-1.0.so -> libgstvideo-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgstvideo-1.0.so.0 -> libgstvideo-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgstvideo-1.0.so.0.1400.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gstreamer-allocators-1.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gstreamer-app-1.0.pc @@ -258,7 +273,6 @@ drwxr-xr-x root/root usr/share/gir-1.0/ -rw-r--r-- root/root usr/share/gir-1.0/GstAllocators-1.0.gir -rw-r--r-- root/root usr/share/gir-1.0/GstApp-1.0.gir -rw-r--r-- root/root usr/share/gir-1.0/GstAudio-1.0.gir --rw-r--r-- root/root usr/share/gir-1.0/GstFft-1.0.gir -rw-r--r-- root/root usr/share/gir-1.0/GstPbutils-1.0.gir -rw-r--r-- root/root usr/share/gir-1.0/GstRtp-1.0.gir -rw-r--r-- root/root usr/share/gir-1.0/GstRtsp-1.0.gir diff --git a/gst-plugins-base/.md5sum b/gst-plugins-base/.md5sum index 4fa54f366..0a3114271 100644 --- a/gst-plugins-base/.md5sum +++ b/gst-plugins-base/.md5sum @@ -1 +1 @@ -b35b04071f69b8ab69a7f3a497ff0131 gst-plugins-base-1.12.4.tar.xz +370271327dd23110421a9c2927ac989a gst-plugins-base-1.14.0.tar.xz diff --git a/gst-plugins-base/.signature b/gst-plugins-base/.signature index f5e3aec63..e395fd86d 100644 --- a/gst-plugins-base/.signature +++ b/gst-plugins-base/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/TZs89jc6OjcjkBtxu4PyabMHEBhN2yMandqlz1k1PB/Tsefp3dYGgpR5GFk1DPmY86BrhY7+cZTbw+LK6Zc/Qo= -SHA256 (Pkgfile) = 28ebb43f3fa03af667774ddc1e0e7dc256682cb4557114ca51bae12b4b68bca7 -SHA256 (.footprint) = 3229271eac71108f158077586a0220f8598e02b165ac703d9b2e6be3ce7673e2 -SHA256 (gst-plugins-base-1.12.4.tar.xz) = 4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282 +RWSE3ohX2g5d/ZsMByNIZVBVjwrZAykP2qg0AiBCDtH4dOIKSqFexbS3AedVM/w1YWLNMKIyHFi0SJAASWBOeCCu0wnjBSnQFQU= +SHA256 (Pkgfile) = f8ae782a95de8067cd3a321df590dbbc8415f3a6f5df3c6f71f761ec5ab74cf9 +SHA256 (.footprint) = 3c28d8cb7bb8721f88bd610854874025ca41542407afbb8ca90fe178dfa08b89 +SHA256 (gst-plugins-base-1.14.0.tar.xz) = 7e904660ff56e02b036cf7fdfb77a50a540828ca9d2614d69ba931772e5b6940 diff --git a/gst-plugins-base/Pkgfile b/gst-plugins-base/Pkgfile index 8c028a8d7..9efefbed9 100644 --- a/gst-plugins-base/Pkgfile +++ b/gst-plugins-base/Pkgfile @@ -1,11 +1,10 @@ # Description: An essential exemplary set of plugins for gstreamer. # URL: https://gstreamer.freedesktop.org/modules/gst-plugins-base.html # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Matt Housh, jaeger at morpheus dot net # Depends on: alsa-lib cdparanoia gstreamer libtheora libvisual orc pango util-linux xorg-libxv name=gst-plugins-base -version=1.12.4 +version=1.14.0 release=1 source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz)

1 0

ports/opt (3.4): gstreamer: 1.12.4 -> 1.14.0
by crux＠crux.nu 30 Mar '18

30 Mar '18

commit d3ec098f26cb136346cf573d55e9e03d7c624ef4 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Mar 30 12:59:44 2018 +1100 gstreamer: 1.12.4 -> 1.14.0 diff --git a/gstreamer/.footprint b/gstreamer/.footprint index 23da790ab..c95f74e6d 100644 --- a/gstreamer/.footprint +++ b/gstreamer/.footprint @@ -8,8 +8,10 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/gstreamer-1.0/ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/base/ +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/base/base-prelude.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/base/base.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/base/gstadapter.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/base/gstaggregator.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/base/gstbaseparse.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/base/gstbasesink.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/base/gstbasesrc.h @@ -24,6 +26,7 @@ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/base/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/base/gstqueuearray.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/base/gsttypefindhelper.h drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/check/ +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/check/check-prelude.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/check/check.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/check/gstbufferstraw.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/check/gstcheck.h @@ -33,6 +36,7 @@ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/check/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/check/internal-check.h drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/controller/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/controller/controller-enumtypes.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/controller/controller-prelude.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/controller/controller.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/controller/gstargbcontrolbinding.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/controller/gstdirectcontrolbinding.h @@ -91,6 +95,7 @@ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/controller/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/gstpluginfeature.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/gstpoll.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/gstpreset.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/gstpromise.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/gstprotection.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/gstquery.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/gstregistry.h @@ -124,6 +129,7 @@ drwxr-xr-x root/root usr/include/gstreamer-1.0/gst/net/ -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/net/gstnettimepacket.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/net/gstnettimeprovider.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/net/gstptpclock.h +-rw-r--r-- root/root usr/include/gstreamer-1.0/gst/net/net-prelude.h -rw-r--r-- root/root usr/include/gstreamer-1.0/gst/net/net.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/girepository-1.0/ @@ -141,25 +147,25 @@ drwxr-xr-x root/root usr/lib/gstreamer-1.0/ -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstcoretracers.la -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstcoretracers.so -rwxr-xr-x root/root usr/lib/libgstbase-1.0.la -lrwxrwxrwx root/root usr/lib/libgstbase-1.0.so -> libgstbase-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgstbase-1.0.so.0 -> libgstbase-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgstbase-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgstbase-1.0.so -> libgstbase-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgstbase-1.0.so.0 -> libgstbase-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgstbase-1.0.so.0.1400.0 -rwxr-xr-x root/root usr/lib/libgstcheck-1.0.la -lrwxrwxrwx root/root usr/lib/libgstcheck-1.0.so -> libgstcheck-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgstcheck-1.0.so.0 -> libgstcheck-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgstcheck-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgstcheck-1.0.so -> libgstcheck-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgstcheck-1.0.so.0 -> libgstcheck-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgstcheck-1.0.so.0.1400.0 -rwxr-xr-x root/root usr/lib/libgstcontroller-1.0.la -lrwxrwxrwx root/root usr/lib/libgstcontroller-1.0.so -> libgstcontroller-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgstcontroller-1.0.so.0 -> libgstcontroller-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgstcontroller-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgstcontroller-1.0.so -> libgstcontroller-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgstcontroller-1.0.so.0 -> libgstcontroller-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgstcontroller-1.0.so.0.1400.0 -rwxr-xr-x root/root usr/lib/libgstnet-1.0.la -lrwxrwxrwx root/root usr/lib/libgstnet-1.0.so -> libgstnet-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgstnet-1.0.so.0 -> libgstnet-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgstnet-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgstnet-1.0.so -> libgstnet-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgstnet-1.0.so.0 -> libgstnet-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgstnet-1.0.so.0.1400.0 -rwxr-xr-x root/root usr/lib/libgstreamer-1.0.la -lrwxrwxrwx root/root usr/lib/libgstreamer-1.0.so -> libgstreamer-1.0.so.0.1204.0 -lrwxrwxrwx root/root usr/lib/libgstreamer-1.0.so.0 -> libgstreamer-1.0.so.0.1204.0 --rwxr-xr-x root/root usr/lib/libgstreamer-1.0.so.0.1204.0 +lrwxrwxrwx root/root usr/lib/libgstreamer-1.0.so -> libgstreamer-1.0.so.0.1400.0 +lrwxrwxrwx root/root usr/lib/libgstreamer-1.0.so.0 -> libgstreamer-1.0.so.0.1400.0 +-rwxr-xr-x root/root usr/lib/libgstreamer-1.0.so.0.1400.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gstreamer-1.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gstreamer-base-1.0.pc diff --git a/gstreamer/.md5sum b/gstreamer/.md5sum index 4b539015a..437555d7c 100644 --- a/gstreamer/.md5sum +++ b/gstreamer/.md5sum @@ -1 +1 @@ -9d268f2e891cce1ac0832f1cc467d4ea gstreamer-1.12.4.tar.xz +63c7cbfb86aa28c4522e374dc5555b96 gstreamer-1.14.0.tar.xz diff --git a/gstreamer/.signature b/gstreamer/.signature index 0ea3e2566..15cc3f327 100644 --- a/gstreamer/.signature +++ b/gstreamer/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/RUolIg0PfuFF9GrmREmlzQQQMFondY9XRMHEhzHmJQQ/fjDPKBdKImqJQ9vdwHBwUtzxMLVd1ucnFWSJbMlTwU= -SHA256 (Pkgfile) = 9da5c77fa53e39378c0ae68fcfccddb76f69f384a2bf89bfce78ffb07cbcb170 -SHA256 (.footprint) = 4689922670ee70eeaa6080cd5dd0e336ea5c157173ec6439aed5a3c9630296c5 -SHA256 (gstreamer-1.12.4.tar.xz) = 5a8704aa4c2eeb04da192c4a9942f94f860ac1a585de90d9f914bac26a970674 +RWSE3ohX2g5d/aUxHYeuK/gw2NcDfSxq6RvjZqgW5zUPNWpf2T1uJclIgl4J+m6CibX5ESVXpRC78B4j1RhC13frDW+fF3FdXQI= +SHA256 (Pkgfile) = 44b7d20d31282cd75ca0bf8f03287642bd0f10c728972a1ae482c3875545e04f +SHA256 (.footprint) = 4f8137783b9ac6ef85f48867ae890a496e11a0e1b6b753cc734ca2d6e399b23a +SHA256 (gstreamer-1.14.0.tar.xz) = fc361367f0d4b780a868a8833f9f30b9c9f4ac9faea4e6b251db8b4b0398466e diff --git a/gstreamer/Pkgfile b/gstreamer/Pkgfile index 9eea4e163..e210bf8e1 100644 --- a/gstreamer/Pkgfile +++ b/gstreamer/Pkgfile @@ -1,11 +1,10 @@ # Description: Gstreamer is a library that allows the construction of graphs of media-handling components. # URL: https://gstreamer.freedesktop.org/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Matt Housh, jaeger at morpheus dot net # Depends on: gobject-introspection libcap name=gstreamer -version=1.12.4 +version=1.14.0 release=1 source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz)

1 0

ports/opt (3.4): htop: 2.0.1 -> 2.1.0
by crux＠crux.nu 30 Mar '18

30 Mar '18

commit 9e11195c83de4df385d44eeac60337e0fb504915 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Mar 30 12:22:51 2018 +1100 htop: 2.0.1 -> 2.1.0 diff --git a/htop/.md5sum b/htop/.md5sum index 8b6697349..55cc5d37e 100644 --- a/htop/.md5sum +++ b/htop/.md5sum @@ -1 +1 @@ -f75fe92b4defaa80d99109830f34b5e2 htop-2.0.1.tar.gz +f262b66ad6c194782f4d3a80627e84c8 htop-2.1.0.tar.gz diff --git a/htop/.signature b/htop/.signature index e8f202f2c..f80f1cd23 100644 --- a/htop/.signature +++ b/htop/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/U6tVF41XEc/gzngGn6bLt3A8RwxH1dfQxBYFB/DBB8GW6SJEocSvg7gTvYTVdaduodM0ps+BdctaXEIPBdyjgM= -SHA256 (Pkgfile) = ee64bc38efa0f5b263efba4f914ad1601220f1e36211182f8842a59cc58782e1 +RWSE3ohX2g5d/SYh1/ubvr+8yO6RwCP3P+zOjmhY7wRoMxGATxofbBsX+a87JBkF3vmhE0hoY90qYI77OTnjEyosXUwWh4PQCAY= +SHA256 (Pkgfile) = 2bf707734ca2ad311f178c96897d948af38d7d4af1b2e3965c459ffd2019333c SHA256 (.footprint) = f11cf3a232e1f7885985d2d8ee00b4dbfbd263941e45f11afb4c6c56829b148f -SHA256 (htop-2.0.1.tar.gz) = f410626dfaf6b70fdf73cd7bb33cae768869707028d847fed94a978e974f5666 +SHA256 (htop-2.1.0.tar.gz) = 3260be990d26e25b6b49fc9d96dbc935ad46e61083c0b7f6df413e513bf80748 diff --git a/htop/Pkgfile b/htop/Pkgfile index 438ebf250..5639f5982 100644 --- a/htop/Pkgfile +++ b/htop/Pkgfile @@ -2,16 +2,16 @@ # Maintainer: Thomas Penteker, tek at serverop dot de # Description: an interactive process viewer # URL: http://hisham.hm/htop -# Depends on: ncurses +# Depends on: python name=htop -version=2.0.1 +version=2.1.0 release=1 -source=(http://hisham.hm/htop/releases/$version/htop-$version.tar.gz) +source=(https://hisham.hm/htop/releases/$version/htop-$version.tar.gz) build() { cd $name-$version - ./configure --prefix=/usr --disable-nls --mandir=/usr/share/man + ./configure --prefix=/usr make make DESTDIR=$PKG install

1 0

ports/opt (3.4): rdiff: fix man path closes FS#1545
by crux＠crux.nu 30 Mar '18

30 Mar '18

commit 8fd04d5192902012ebae134ce9cad962c4be2b60 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Mar 30 12:17:55 2018 +1100 rdiff: fix man path closes FS#1545 diff --git a/rdiff/.footprint b/rdiff/.footprint index 6208d18c0..32a761e99 100644 --- a/rdiff/.footprint +++ b/rdiff/.footprint @@ -2,5 +2,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/rdiff drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/man1/ --rw-r--r-- root/root usr/share/man1/rdiff.1 +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/rdiff.1.gz diff --git a/rdiff/.signature b/rdiff/.signature index 544fb65ba..2a16c9378 100644 --- a/rdiff/.signature +++ b/rdiff/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WrPntG9cZJhk1FAAr1WDZ2ZgFxsfmu//CcKcR4+pW15JG4e1XkSLGJhTw0BfCfC8b6QnMYmQ3emTng7iUBglwU= -SHA256 (Pkgfile) = a66487eb39da6165af88b0d417a1e0e0eccbc13a164e27605c913e14502d13a7 -SHA256 (.footprint) = 898cab3185d9f15dd983a0cd647fb31a395d17e73b0ae79adc683b2a6a60c73a +RWSE3ohX2g5d/St35yprnP94XVGqAeHHyV9T4DtVa4IW6lqEpGE37m1zyMTIJImgOcSZcTWOs8ueVDmOn/G9+giThX8S6L3/kQQ= +SHA256 (Pkgfile) = f9796a372fa70dda57a106d8caf076ea3f83415b80edc87170d7b469a073559e +SHA256 (.footprint) = 062bd0639c689fe4383b3d3d1321dbbed7b2e498ea2db16d4d58f2685da7bf7f SHA256 (librsync-0.9.7.tar.gz) = 6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6 SHA256 (librsync.patch) = 3e9af018401b964512274c67d6b7bf427222cf9a40f280d3b5b531fdcb32410b diff --git a/rdiff/Pkgfile b/rdiff/Pkgfile index d566871d6..8b7340d04 100644 --- a/rdiff/Pkgfile +++ b/rdiff/Pkgfile @@ -6,7 +6,7 @@ name=rdiff version=0.9.7 -release=2 +release=3 source=(http://download.sourceforge.net/librsync/librsync-${version}.tar.gz librsync.patch) @@ -19,5 +19,5 @@ build() { make install -D -m 755 rdiff $PKG/usr/bin/rdiff - install -D -m 644 doc/rdiff.1 $PKG/usr/share/man1/rdiff.1 + install -D -m 644 doc/rdiff.1 $PKG/usr/share/man/man1/rdiff.1 }

1 0

ports/opt (3.4): xpdf: fix man path
by crux＠crux.nu 30 Mar '18

30 Mar '18

commit 0a08637d53d9533eb55223c0d97cbbdfd437c798 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Mar 30 12:15:16 2018 +1100 xpdf: fix man path diff --git a/xpdf/.footprint b/xpdf/.footprint index 783c3a40a..ef1746546 100644 --- a/xpdf/.footprint +++ b/xpdf/.footprint @@ -2,5 +2,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/xpdf drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/man1/ --rw-r--r-- root/root usr/share/man1/xpdf.1 +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/xpdf.1.gz diff --git a/xpdf/.signature b/xpdf/.signature index 0bd07c372..346968e26 100644 --- a/xpdf/.signature +++ b/xpdf/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/RGAU2YdoUGUFzgamG8an4+2VS2k+LHWt40+5/k6k7P5v0LXxdYFfBrTOq+w+xja3Qn7w/fEDE6fp8ybONpEdwc= -SHA256 (Pkgfile) = 8dc18d09fcac985c6c3d558183c590e684c13a262c94aa469d82a17074b95d67 -SHA256 (.footprint) = 02ccfdcb986da4163514c606e214181e3ab001e9134b5973909010fdb3c06525 +RWSE3ohX2g5d/Sq3sL/V+rvS5XsybIZlVoTOZHExWsiI0Bn68UFsnsSAD+Uo3ImBwxJ7Y0MuwKDjKTRulP9Pu30XCz1ZmIeevQE= +SHA256 (Pkgfile) = 8eb14596fceaab62a1d6d08853eda6240038786bb0b523f8a23194b2cae02a0d +SHA256 (.footprint) = b04fc4d3a62e3311e32f9350e044e905495c74101132621641fe2088f7248bdc SHA256 (xpdf-4.00.tar.gz) = ff3d92c42166e35b1ba6aec9b5f0adffb5fc05a3eb95dc49505b6e344e4216d6 diff --git a/xpdf/Pkgfile b/xpdf/Pkgfile index 3c48bf6c2..cd45735a9 100644 --- a/xpdf/Pkgfile +++ b/xpdf/Pkgfile @@ -7,7 +7,7 @@ name=xpdf version=4.00 -release=1 +release=2 source=(https://xpdfreader-dl.s3.amazonaws.com/xpdf-${version}.tar.gz) build() { @@ -22,7 +22,7 @@ build() { cd xpdf-qt - sed -i 's|man/man1|share/man1|g' cmake_install.cmake + sed -i 's|man/man1|share/man/man1|g' cmake_install.cmake make make install DESTDIR=$PKG

1 0

ports/opt (3.4): mplayer: fix man path
by crux＠crux.nu 30 Mar '18

30 Mar '18

commit 636596f91820b61187aefb487a4d0887f0e20ef4 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Mar 30 12:10:53 2018 +1100 mplayer: fix man path diff --git a/mplayer/.footprint b/mplayer/.footprint index e01d5e167..535205663 100644 --- a/mplayer/.footprint +++ b/mplayer/.footprint @@ -7,9 +7,10 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/mencoder -rwxr-xr-x root/root usr/bin/mplayer drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/man1/ -lrwxrwxrwx root/root usr/share/man1/mencoder.1.gz -> mplayer.1.gz --rw-r--r-- root/root usr/share/man1/mplayer.1 +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +lrwxrwxrwx root/root usr/share/man/man1/mencoder.1.gz -> mplayer.1.gz +-rw-r--r-- root/root usr/share/man/man1/mplayer.1.gz drwxr-xr-x root/root usr/share/mplayer/ lrwxrwxrwx root/root usr/share/mplayer/font -> font-arial-14-iso-8859-1 drwxr-xr-x root/root usr/share/mplayer/font-arial-14-iso-8859-1/ diff --git a/mplayer/.signature b/mplayer/.signature index b434055e2..d1875678c 100644 --- a/mplayer/.signature +++ b/mplayer/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/fF8ie9Ighrtd1W6Knd82c3M6jGNEO3aMM80ywqYshY8cWa+PhWt4MxL40y7e+uqLp6cjpVCxQFR75w1ZO+Buwk= -SHA256 (Pkgfile) = f85e079856609f489bee60aa6369771bfb5f0494e6ba5350ba61f7749422edf9 -SHA256 (.footprint) = f341ce2740c1643bd7664028b1b539b7f418d9e704b6b11bcbd9b209e5073feb +RWSE3ohX2g5d/YaP4eLwWgcv/l/tI8iqtNit6Idfo2WOji5eGBvWqBmYY4AU3WknAoXJPpNnFyqeqExu0eKv4YNGF/dR0HgFyQM= +SHA256 (Pkgfile) = 206192422edb8d75a7a258557c6b1ef846f8b87d0f651a396b22acd84efe9ff9 +SHA256 (.footprint) = c4022a781b4eed8125c34441be6094deda7e20f9463587f6d17478545820f566 SHA256 (mplayer-2017-04-29.tar.xz) = f6387c132ebf4db095d60cd37e8e55b582fbd58714f0d431af6f8dd64a24cbb9 SHA256 (font-arial-iso-8859-1.tar.bz2) = 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 SHA256 (mplayer.conf) = ea4cdab97915490376653b1be791306b641429a5cee24f5c1fbe4ef07fcc20d1 diff --git a/mplayer/Pkgfile b/mplayer/Pkgfile index 7fad432c3..21defd2c1 100644 --- a/mplayer/Pkgfile +++ b/mplayer/Pkgfile @@ -7,7 +7,7 @@ name=mplayer version=2017-04-29 -release=1 +release=2 source=(http://distfiles.serverop.de/mplayer-$version.tar.xz http://www1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.b… mplayer.conf) @@ -20,13 +20,13 @@ build() { rm -f ffmpeg/mp_auto_pull ./configure --prefix=/usr \ - --mandir=/usr/share \ + --mandir=/usr/share/man \ --codecsdir=/usr/share/codecs \ --confdir=/etc/mplayer make make DESTDIR=$PKG install - (cd $PKG/usr/share/man1; rm mencoder.1; ln -s mplayer.1.gz mencoder.1.gz) + (cd $PKG/usr/share/man/man1; rm mencoder.1; ln -s mplayer.1.gz mencoder.1.gz) # fonts mkdir -p $PKG/usr/share/mplayer

1 0

ports/opt (3.4): lsof: 4.89 -> 4.91
by crux＠crux.nu 30 Mar '18

30 Mar '18

commit de8cd5ff9080fd6d91f2fed5c56cb12f25b69962 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Mar 30 11:59:44 2018 +1100 lsof: 4.89 -> 4.91 diff --git a/lsof/.footprint b/lsof/.footprint index 5d478d020..0cf4e796e 100644 --- a/lsof/.footprint +++ b/lsof/.footprint @@ -2,5 +2,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/lsof drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/man8/ --rw-r--r-- root/root usr/share/man8/lsof.8 +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man8/ +-rw-r--r-- root/root usr/share/man/man8/lsof.8.gz diff --git a/lsof/.md5sum b/lsof/.md5sum index feb99ea3c..69d041f10 100644 --- a/lsof/.md5sum +++ b/lsof/.md5sum @@ -1 +1 @@ -1b9cd34f3fb86856a125abbf2be3a386 lsof_4.89.tar.bz2 +148ed410cb52e08c2adc0c60f480f11f lsof_4.91.tar.bz2 diff --git a/lsof/.signature b/lsof/.signature index e93bea622..099ae3533 100644 --- a/lsof/.signature +++ b/lsof/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/eXzGSPen4jb8C6/eCPOEEVZB3N6AHxCg6Zip66yWbSnN8vS3JbL6Yhluz7ZWVwbVqk/D8X9I6pRbue0yr2s4Aw= -SHA256 (Pkgfile) = 9b045d297bf3c04a707ff4fb047a89c98b45e5f249c62266502bd7a6bdb646ba -SHA256 (.footprint) = 5e7aae542e078c72ac698c0bab0f995e4ae7d3548983c0c6c8b82958952a41e9 -SHA256 (lsof_4.89.tar.bz2) = 81ac2fc5fdc944793baf41a14002b6deb5a29096b387744e28f8c30a360a3718 +RWSE3ohX2g5d/QG5WdHRuQlEYBo/r/EGUYCOemuj7SGVCdNuv1/TUtA39+xUwM2G2u25BRVQSM6MUTNqPz5i5HW+Tn8cp6iCNgw= +SHA256 (Pkgfile) = 747b4121ccfa3e4016f1d2ad33ecc24e2c320a7af5021c4d2b8d4f1dabace5ff +SHA256 (.footprint) = 96955c2b8db524dff639fc12c2b50fbf1ac8fb0049828b76aa7da8fd8628c06b +SHA256 (lsof_4.91.tar.bz2) = c9da946a525fbf82ff80090b6d1879c38df090556f3fe0e6d782cb44172450a3 diff --git a/lsof/Pkgfile b/lsof/Pkgfile index c0c237587..5f4d2a1a0 100644 --- a/lsof/Pkgfile +++ b/lsof/Pkgfile @@ -4,7 +4,7 @@ # Packager: sten, nick dot steeves at shaw dot ca name=lsof -version=4.89 +version=4.91 release=1 source=(ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/lsof_$version.tar.bz2) @@ -16,5 +16,5 @@ build() { sed -i -e "s/-DLINUXV/${CFLAGS} -DLINUXV/" Makefile make install -D -m 755 lsof $PKG/usr/sbin/lsof - install -D -m 644 lsof.8 $PKG/usr/share/man8/lsof.8 + install -D -m 644 lsof.8 $PKG/usr/share/man/man8/lsof.8 }

1 0

ports/opt (3.4): texlive: fix build, closes FS#1485
by crux＠crux.nu 30 Mar '18

30 Mar '18

commit 70de4b5b292b8d7ab029556525fc91f44aff3ba1 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Mar 30 11:54:14 2018 +1100 texlive: fix build, closes FS#1485 diff --git a/texlive/.md5sum b/texlive/.md5sum index 1663dff8f..605a6faa8 100644 --- a/texlive/.md5sum +++ b/texlive/.md5sum @@ -1,3 +1,4 @@ f15ac876fcdc8be865b16535f480aa54 texi2html-5.0.tar.bz2 f98f6bde0a2c20fc894d983d542beaad texlive-20170524-source.tar.xz 44bb5d71fc64ac90118f8c5013e39b89 texlive-20170524-texmf.tar.xz +d1d3bebf301d088fda0c37d0f08cfe6d texlive-poppler-0.59.patch diff --git a/texlive/.signature b/texlive/.signature index cd967ab3c..b4ff02360 100644 --- a/texlive/.signature +++ b/texlive/.signature @@ -1,7 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ZjHad2wEUuTHLLBthBFShPEdkF0BgVeiZJw16LMHxACaHCRhEPvq5Ofsm5ODWxQjOlw9IY30BGIzVT289stYwE= -SHA256 (Pkgfile) = ab76f4da3f714c66b682cc326db6a575dde69ae4498e20726959a6200451654e +RWSE3ohX2g5d/Tw8T4iAGdZBWxCG8dyX6x/99fdNsME5dTqZtqSwl7SHEV4F+vh83lE7WHzQgwg0+/9ibqcSPsG/guYQaPPjFgQ= +SHA256 (Pkgfile) = a70d12a8453bf825e5e6bdd1cea2a842b4894443a77f2c2a1507ccff6fe2e66c SHA256 (.footprint) = 70e222484dc823f187d29a79ff94578b0fa4b21f84bd75b38f0b4802db7a55ef SHA256 (texlive-20170524-texmf.tar.xz) = 3f63708b77f8615ec6f2f7c93259c5f584d1b89dd335a28f2362aef9e6f0c9ec SHA256 (texlive-20170524-source.tar.xz) = 0161695304e941334dc0b3b5dabcf8edf46c09b7bc33eea8229b5ead7ccfb2aa SHA256 (texi2html-5.0.tar.bz2) = e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89d9f9fa +SHA256 (texlive-poppler-0.59.patch) = 82703c2d8698e15ee9a8bed6eee1a7140dc48ea2f65a497ddf81f187df6e6832 diff --git a/texlive/Pkgfile b/texlive/Pkgfile index 48b643e8a..accbc0959 100644 --- a/texlive/Pkgfile +++ b/texlive/Pkgfile @@ -8,7 +8,8 @@ version=20170524 release=1 source=(ftp://tug.org/historic/systems/texlive/${version:0:4}/$name-$versio… ftp://tug.org/historic/systems/texlive/${version:0:4}/$name-$version-source… - http://download.savannah.gnu.org/releases/texi2html/texi2html-5.0.tar.bz2) + http://download.savannah.gnu.org/releases/texi2html/texi2html-5.0.tar.bz2 + texlive-poppler-0.59.patch) build() { cd $name-$version-source @@ -21,6 +22,9 @@ build() { $ -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 $ \ -exec chmod 644 {} \; + # Fix build with poppler 0.59.0 (thanks to Archlinux) + patch -Np1 < $SRC/texlive-poppler-0.59.patch + # Fix some paths sed -i 's|TEXMFROOT = .*|TEXMFROOT = $SELFAUTODIR/share|g' texk/kpathsea/texmf.cnf sed -i 's|TEXMFLOCAL = .*|TEXMFLOCAL = $TEXMFROOT/texmf-local|g' texk/kpathsea/texmf.cnf diff --git a/texlive/texlive-poppler-0.59.patch b/texlive/texlive-poppler-0.59.patch new file mode 100644 index 000000000..cd9160d73 --- /dev/null +++ b/texlive/texlive-poppler-0.59.patch @@ -0,0 +1,1145 @@ +diff -ur source.orig/texk/web2c/luatexdir/image/pdftoepdf.w source/texk/web2c/luatexdir/image/pdftoepdf.w +--- source.orig/texk/web2c/luatexdir/image/pdftoepdf.w 2017-05-08 22:39:36.639375783 +0200 ++++ source/texk/web2c/luatexdir/image/pdftoepdf.w 2017-09-19 11:23:36.586768739 +0200 +@@ -224,7 +224,7 @@ + free(checksum); + } + if (pdf_doc->doc == NULL) { +- docmemstream = new MemStream( docstream,0,streamsize, obj.initNull() ); ++ docmemstream = new MemStream( docstream,0,streamsize, Object(objNull) ); + doc = new PDFDoc(docmemstream); /* takes ownership of docmemstream */ + pdf_doc->pc++; + if (!doc->isOk() || !doc->okToPrint()) { +@@ -408,9 +408,8 @@ + Object obj1; + pdf_begin_array(pdf); + for (i = 0, l = array->getLength(); i < l; ++i) { +- array->getNF(i, &obj1); ++ obj1 = array->getNF(i); + copyObject(pdf, pdf_doc, &obj1); +- obj1.free(); + } + pdf_end_array(pdf); + } +@@ -422,9 +421,8 @@ + pdf_begin_dict(pdf); + for (i = 0, l = dict->getLength(); i < l; ++i) { + copyName(pdf, dict->getKey(i)); +- dict->getValNF(i, &obj1); ++ obj1 = dict->getValNF(i); + copyObject(pdf, pdf_doc, &obj1); +- obj1.free(); + } + pdf_end_dict(pdf); + } +@@ -510,13 +508,12 @@ + PDFDoc *doc = pdf_doc->doc; + xref = doc->getXRef(); + for (r = pdf_doc->inObjList; r != NULL;) { +- xref->fetch(r->ref.num, r->ref.gen, &obj1); ++ obj1 = xref->fetch(r->ref.num, r->ref.gen); + if (obj1.isStream()) + pdf_begin_obj(pdf, r->num, OBJSTM_NEVER); + else + pdf_begin_obj(pdf, r->num, 2); + copyObject(pdf, pdf_doc, &obj1); +- obj1.free(); + pdf_end_obj(pdf); + n = r->next; + delete r; +@@ -740,7 +737,7 @@ + catalog = doc->getCatalog(); + page = catalog->getPage(img_pagenum(idict)); + pageref = catalog->getPageRef(img_pagenum(idict)); +- doc->getXRef()->fetch(pageref->num, pageref->gen, &pageobj); ++ pageobj = doc->getXRef()->fetch(pageref->num, pageref->gen); + pageDict = pageobj.getDict(); + /* write the Page header */ + pdf_begin_obj(pdf, img_objnum(idict), OBJSTM_NEVER); +@@ -757,12 +754,11 @@ + pdf_dict_add_int(pdf, "PTEX.PageNumber", (int) img_pagenum(idict)); + } + if ((suppress_optional_info & 8) == 0) { +- doc->getDocInfoNF(&obj1); ++ obj1 = doc->getDocInfoNF(); + if (obj1.isRef()) { + /* the info dict must be indirect (PDF Ref p. 61) */ + pdf_dict_add_ref(pdf, "PTEX.InfoDict", addInObj(pdf, pdf_doc, obj1.getRef())); + } +- obj1.free(); + } + if (img_is_bbox(idict)) { + bbox[0] = sp2bp(img_bbox(idict)[0]); +@@ -788,19 +784,17 @@ + Now all relevant parts of the Page dictionary are copied. Metadata validity + check is needed(as a stream it must be indirect). + */ +- pageDict->lookupNF("Metadata", &obj1); ++ obj1 = pageDict->lookupNF("Metadata"); + if (!obj1.isNull() && !obj1.isRef()) + formatted_warning("pdf inclusion","/Metadata must be indirect object"); +- obj1.free(); + /* copy selected items in Page dictionary */ + for (i = 0; pagedictkeys[i] != NULL; i++) { +- pageDict->lookupNF(pagedictkeys[i], &obj1); ++ obj1 = pageDict->lookupNF(pagedictkeys[i]); + if (!obj1.isNull()) { + pdf_add_name(pdf, pagedictkeys[i]); + /* preserves indirection */ + copyObject(pdf, pdf_doc, &obj1); + } +- obj1.free(); + } + /* + If there are no Resources in the Page dict of the embedded page, +@@ -808,32 +802,28 @@ + PDF file, climbing up the tree until the Resources are found. + (This fixes a problem with Scribus 1.3.3.14.) + */ +- pageDict->lookupNF("Resources", &obj1); ++ obj1 = pageDict->lookupNF("Resources"); + if (obj1.isNull()) { + op1 = &pagesobj1; + op2 = &pagesobj2; +- pageDict->lookup("Parent", op1); ++ *op1 = pageDict->lookup("Parent"); + while (op1->isDict()) { +- obj1.free(); +- op1->dictLookupNF("Resources", &obj1); ++ obj1 = op1->dictLookupNF("Resources"); + if (!obj1.isNull()) { + pdf_add_name(pdf, "Resources"); + copyObject(pdf, pdf_doc, &obj1); + break; + } +- op1->dictLookup("Parent", op2); ++ *op2 = op1->dictLookup("Parent"); + optmp = op1; + op1 = op2; + op2 = optmp; +- op2->free(); + }; + if (!op1->isDict()) + formatted_warning("pdf inclusion","Page /Resources missing"); +- op1->free(); + } +- obj1.free(); + /* Write the Page contents. */ +- page->getContents(&contents); ++ contents = page->getContents(); + if (contents.isStream()) { + /* + Variant A: get stream and recompress under control of \pdfcompresslevel +@@ -844,27 +834,23 @@ + + Variant B: copy stream without recompressing + */ +- contents.streamGetDict()->lookup("F", &obj1); ++ obj1 = contents.streamGetDict()->lookup("F"); + if (!obj1.isNull()) { + normal_error("pdf inclusion","unsupported external stream"); + } +- obj1.free(); +- contents.streamGetDict()->lookup("Length", &obj1); ++ obj1 = contents.streamGetDict()->lookup("Length"); + pdf_add_name(pdf, "Length"); + copyObject(pdf, pdf_doc, &obj1); +- obj1.free(); +- contents.streamGetDict()->lookup("Filter", &obj1); ++ obj1 = contents.streamGetDict()->lookup("Filter"); + if (!obj1.isNull()) { + pdf_add_name(pdf, "Filter"); + copyObject(pdf, pdf_doc, &obj1); +- obj1.free(); +- contents.streamGetDict()->lookup("DecodeParms", &obj1); ++ obj1 = contents.streamGetDict()->lookup("DecodeParms"); + if (!obj1.isNull()) { + pdf_add_name(pdf, "DecodeParms"); + copyObject(pdf, pdf_doc, &obj1); + } + } +- obj1.free(); + pdf_end_dict(pdf); + pdf_begin_stream(pdf); + copyStreamStream(pdf, contents.getStream()->getUndecodedStream()); +@@ -875,8 +861,8 @@ + pdf_end_dict(pdf); + pdf_begin_stream(pdf); + for (i = 0, l = contents.arrayGetLength(); i < l; ++i) { +- copyStreamStream(pdf, (contents.arrayGet(i, &obj1))->getStream()); +- obj1.free(); ++ obj1 = contents.arrayGet(i); ++ copyStreamStream(pdf, obj1.getStream()); + if (i < (l - 1)) { + /* + Put a space between streams to be on the safe side (streams +@@ -897,8 +883,6 @@ + } + /* write out all indirect objects */ + writeRefs(pdf, pdf_doc); +- contents.free(); +- pageobj.free(); + /* + unrefPdfDocument() must come after contents.free() and pageobj.free()! + TH: The next line makes repeated pdf inclusion unacceptably slow +diff -ur source.orig/texk/web2c/luatexdir/lua/lepdflib.cc source/texk/web2c/luatexdir/lua/lepdflib.cc +--- source.orig/texk/web2c/luatexdir/lua/lepdflib.cc 2017-05-08 22:39:36.689375107 +0200 ++++ source/texk/web2c/luatexdir/lua/lepdflib.cc 2017-09-19 09:48:19.658021769 +0200 +@@ -538,7 +538,7 @@ + pdfdoc_changed_error(L); \ + uout = new_Object_userdata(L); \ + uout->d = new Object(); \ +- ((in *) uin->d)->function((Object *) uout->d); \ ++ *((Object *)uout->d) = ((in *) uin->d)->function(); \ + uout->atype = ALLOC_LEPDF; \ + uout->pc = uin->pc; \ + uout->pd = uin->pd; \ +@@ -668,13 +668,11 @@ + + static int m_Array_incRef(lua_State * L) + { +- int i; + udstruct *uin; + uin = (udstruct *) luaL_checkudata(L, 1, M_Array); + if (uin->pd != NULL && uin->pd->pc != uin->pc) + pdfdoc_changed_error(L); +- i = ((Array *) uin->d)->incRef(); +- lua_pushinteger(L, i); ++ lua_pushinteger(L, 1); + return 1; + } + +@@ -685,8 +683,7 @@ + uin = (udstruct *) luaL_checkudata(L, 1, M_Array); + if (uin->pd != NULL && uin->pd->pc != uin->pc) + pdfdoc_changed_error(L); +- i = ((Array *) uin->d)->decRef(); +- lua_pushinteger(L, i); ++ lua_pushinteger(L, 1); + return 1; + } + +@@ -702,7 +699,7 @@ + if ((uin->pd != NULL && uin->pd->pc != uin->pc) + || (uobj->pd != NULL && uobj->pd->pc != uobj->pc)) + pdfdoc_changed_error(L); +- ((Array *) uin->d)->add(((Object *) uobj->d)); ++ ((Array *) uin->d)->add(std::move(*((Object *) uobj->d))); + return 0; + } + +@@ -718,7 +715,7 @@ + if (i > 0 && i <= len) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((Array *) uin->d)->get(i - 1, (Object *) uout->d); ++ *((Object *) uout->d) = ((Array *) uin->d)->get(i - 1); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -739,7 +736,7 @@ + if (i > 0 && i <= len) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((Array *) uin->d)->getNF(i - 1, (Object *) uout->d); ++ *((Object *) uout->d) = ((Array *) uin->d)->getNF(i - 1); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -953,25 +950,21 @@ + + static int m_Dict_incRef(lua_State * L) + { +- int i; + udstruct *uin; + uin = (udstruct *) luaL_checkudata(L, 1, M_Dict); + if (uin->pd != NULL && uin->pd->pc != uin->pc) + pdfdoc_changed_error(L); +- i = ((Dict *) uin->d)->incRef(); +- lua_pushinteger(L, i); ++ lua_pushinteger(L, 1); + return 1; + } + + static int m_Dict_decRef(lua_State * L) + { +- int i; + udstruct *uin; + uin = (udstruct *) luaL_checkudata(L, 1, M_Dict); + if (uin->pd != NULL && uin->pd->pc != uin->pc) + pdfdoc_changed_error(L); +- i = ((Dict *) uin->d)->decRef(); +- lua_pushinteger(L, i); ++ lua_pushinteger(L, 1); + return 1; + } + +@@ -986,7 +979,7 @@ + pdfdoc_changed_error(L); + s = copyString(luaL_checkstring(L, 2)); + uobj = (udstruct *) luaL_checkudata(L, 3, M_Object); +- ((Dict *) uin->d)->add(s, ((Object *) uobj->d)); ++ ((Dict *) uin->d)->add(s, std::move(*((Object *) uobj->d))); + return 0; + } + +@@ -999,7 +992,7 @@ + pdfdoc_changed_error(L); + s = luaL_checkstring(L, 2); + uobj = (udstruct *) luaL_checkudata(L, 3, M_Object); +- ((Dict *) uin->d)->set(s, ((Object *) uobj->d)); ++ ((Dict *) uin->d)->set(s, std::move(*((Object *) uobj->d))); + return 0; + } + +@@ -1027,7 +1020,7 @@ + s = luaL_checkstring(L, 2); + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((Dict *) uin->d)->lookup(s, (Object *) uout->d); ++ *((Object *) uout->d) = ((Dict *) uin->d)->lookup(s); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -1044,7 +1037,7 @@ + s = luaL_checkstring(L, 2); + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((Dict *) uin->d)->lookupNF(s, (Object *) uout->d); ++ *((Object *) uout->d) = ((Dict *) uin->d)->lookupNF(s); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -1096,7 +1089,7 @@ + if (i > 0 && i <= len) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((Dict *) uin->d)->getVal(i - 1, (Object *) uout->d); ++ *((Object *) uout->d) = ((Dict *) uin->d)->getVal(i - 1); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -1117,7 +1110,7 @@ + if (i > 0 && i <= len) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((Dict *) uin->d)->getValNF(i - 1, (Object *) uout->d); ++ *((Object *) uout->d) = ((Dict *) uin->d)->getValNF(i - 1); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -1381,9 +1374,9 @@ + pdfdoc_changed_error(L); + luaL_checktype(L, 2, LUA_TBOOLEAN); + if (lua_toboolean(L, 2) != 0) +- ((Object *) uin->d)->initBool(gTrue); ++ *((Object *) uin->d) = Object(gTrue); + else +- ((Object *) uin->d)->initBool(gFalse); ++ *((Object *) uin->d) = Object(gFalse); + return 0; + } + +@@ -1395,7 +1388,7 @@ + if (uin->pd != NULL && uin->pd->pc != uin->pc) + pdfdoc_changed_error(L); + i = luaL_checkint(L, 2); +- ((Object *) uin->d)->initInt(i); ++ *((Object *) uin->d) = Object(i); + return 0; + } + +@@ -1407,7 +1400,7 @@ + if (uin->pd != NULL && uin->pd->pc != uin->pc) + pdfdoc_changed_error(L); + d = luaL_checknumber(L, 2); +- ((Object *) uin->d)->initReal(d); ++ *((Object *) uin->d) = Object(d); + return 0; + } + +@@ -1422,7 +1415,7 @@ + pdfdoc_changed_error(L); + s = luaL_checklstring(L, 2, &len); + gs = new GooString(s, len); +- ((Object *) uin->d)->initString(gs); ++ *((Object *) uin->d) = Object(gs); + return 0; + } + +@@ -1434,7 +1427,7 @@ + if (uin->pd != NULL && uin->pd->pc != uin->pc) + pdfdoc_changed_error(L); + s = luaL_checkstring(L, 2); +- ((Object *) uin->d)->initName(s); ++ *((Object *) uin->d) = Object(objName, s); + return 0; + } + +@@ -1444,13 +1437,14 @@ + uin = (udstruct *) luaL_checkudata(L, 1, M_Object); + if (uin->pd != NULL && uin->pd->pc != uin->pc) + pdfdoc_changed_error(L); +- ((Object *) uin->d)->initNull(); ++ *((Object *) uin->d) = Object(objNull); + return 0; + } + + static int m_Object_initArray(lua_State * L) + { + udstruct *uin, *uxref; ++ Array *a; + uin = (udstruct *) luaL_checkudata(L, 1, M_Object); + uxref = (udstruct *) luaL_checkudata(L, 2, M_XRef); + if (uin->pd != NULL && uxref->pd != NULL && uin->pd != uxref->pd) +@@ -1458,7 +1452,8 @@ + if ((uin->pd != NULL && uin->pd->pc != uin->pc) + || (uxref->pd != NULL && uxref->pd->pc != uxref->pc)) + pdfdoc_changed_error(L); +- ((Object *) uin->d)->initArray((XRef *) uxref->d); ++ a = new Array((XRef *) uxref->d); ++ *((Object *) uin->d) = Object(a); + return 0; + } + +@@ -1469,6 +1464,7 @@ + static int m_Object_initDict(lua_State * L) + { + udstruct *uin, *uxref; ++ Dict *d; + uin = (udstruct *) luaL_checkudata(L, 1, M_Object); + uxref = (udstruct *) luaL_checkudata(L, 2, M_XRef); + if (uin->pd != NULL && uxref->pd != NULL && uin->pd != uxref->pd) +@@ -1476,7 +1472,8 @@ + if ((uin->pd != NULL && uin->pd->pc != uin->pc) + || (uxref->pd != NULL && uxref->pd->pc != uxref->pc)) + pdfdoc_changed_error(L); +- ((Object *) uin->d)->initDict((XRef *) uxref->d); ++ d = new Dict((XRef *) uxref->d); ++ *((Object *) uin->d) = Object(d); + return 0; + } + +@@ -1490,7 +1487,7 @@ + if ((uin->pd != NULL && uin->pd->pc != uin->pc) + || (ustream->pd != NULL && ustream->pd->pc != ustream->pc)) + pdfdoc_changed_error(L); +- ((Object *) uin->d)->initStream((Stream *) ustream->d); ++ *((Object *) uin->d) = Object((Stream *) ustream->d); + return 0; + } + +@@ -1503,7 +1500,7 @@ + pdfdoc_changed_error(L); + num = luaL_checkint(L, 2); + gen = luaL_checkint(L, 3); +- ((Object *) uin->d)->initRef(num, gen); ++ *((Object *) uin->d) = Object(num, gen); + return 0; + } + +@@ -1515,7 +1512,7 @@ + if (uin->pd != NULL && uin->pd->pc != uin->pc) + pdfdoc_changed_error(L); + s = luaL_checkstring(L, 2); +- ((Object *) uin->d)->initCmd(CHARP_CAST s); ++ *((Object *) uin->d) = Object(objCmd, CHARP_CAST s); + return 0; + } + +@@ -1525,7 +1522,7 @@ + uin = (udstruct *) luaL_checkudata(L, 1, M_Object); + if (uin->pd != NULL && uin->pd->pc != uin->pc) + pdfdoc_changed_error(L); +- ((Object *) uin->d)->initError(); ++ *((Object *) uin->d) = Object(objError); + return 0; + } + +@@ -1535,7 +1532,7 @@ + uin = (udstruct *) luaL_checkudata(L, 1, M_Object); + if (uin->pd != NULL && uin->pd->pc != uin->pc) + pdfdoc_changed_error(L); +- ((Object *) uin->d)->initEOF(); ++ *((Object *) uin->d) = Object(objEOF); + return 0; + } + +@@ -1551,7 +1548,7 @@ + pdfdoc_changed_error(L); + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((Object *) uin->d)->fetch((XRef *) uxref->d, (Object *) uout->d); ++ *((Object *) uout->d) = ((Object *) uin->d)->fetch((XRef *) uxref->d); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -1816,7 +1813,7 @@ + pdfdoc_changed_error(L); + if (!((Object *) uin->d)->isArray()) + luaL_error(L, "Object is not an Array"); +- ((Object *) uin->d)->arrayAdd((Object *) uobj->d); ++ ((Object *) uin->d)->arrayAdd(std::move(*((Object *) uobj->d))); + return 0; + } + +@@ -1833,7 +1830,7 @@ + if (i > 0 && i <= len) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((Object *) uin->d)->arrayGet(i - 1, (Object *) uout->d); ++ *((Object *) uout->d) = ((Object *) uin->d)->arrayGet(i - 1); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -1857,7 +1854,7 @@ + if (i > 0 && i <= len) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((Object *) uin->d)->arrayGetNF(i - 1, (Object *) uout->d); ++ *((Object *) uout->d) = ((Object *) uin->d)->arrayGetNF(i - 1); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -1897,7 +1894,7 @@ + pdfdoc_changed_error(L); + if (!((Object *) uin->d)->isDict()) + luaL_error(L, "Object is not a Dict"); +- ((Object *) uin->d)->dictAdd(copyString(s), (Object *) uobj->d); ++ ((Object *) uin->d)->dictAdd(copyString(s), std::move(*((Object *) uobj->d))); + return 0; + } + +@@ -1915,7 +1912,7 @@ + pdfdoc_changed_error(L); + if (!((Object *) uin->d)->isDict()) + luaL_error(L, "Object is not a Dict"); +- ((Object *) uin->d)->dictSet(s, (Object *) uobj->d); ++ ((Object *) uin->d)->dictSet(s, std::move(*((Object *) uobj->d))); + return 0; + } + +@@ -1930,7 +1927,7 @@ + if (((Object *) uin->d)->isDict()) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((Object *) uin->d)->dictLookup(s, (Object *) uout->d); ++ *((Object *) uout->d) = ((Object *) uin->d)->dictLookup(s); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -1950,7 +1947,7 @@ + if (((Object *) uin->d)->isDict()) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((Object *) uin->d)->dictLookupNF(s, (Object *) uout->d); ++ *((Object *) uout->d) = ((Object *) uin->d)->dictLookupNF(s); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -1991,7 +1988,7 @@ + if (i > 0 && i <= len) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((Object *) uin->d)->dictGetVal(i - 1, (Object *) uout->d); ++ *((Object *) uout->d) = ((Object *) uin->d)->dictGetVal(i - 1); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -2015,7 +2012,7 @@ + if (i > 0 && i <= len) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((Object *) uin->d)->dictGetValNF(i - 1, (Object *) uout->d); ++ *((Object *) uout->d) = ((Object *) uin->d)->dictGetValNF(i - 1); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -2243,7 +2240,7 @@ + m_poppler_get_poppler(Page, Dict, getPieceInfo); + m_poppler_get_poppler(Page, Dict, getSeparationInfo); + m_poppler_get_poppler(Page, Dict, getResourceDict); +-m_poppler_get_OBJECT(Page, getAnnots); ++m_poppler_get_OBJECT(Page, getAnnotsObject); + + m_poppler_get_OBJECT(Page, getContents); + +@@ -2270,7 +2267,7 @@ + {"getPieceInfo", m_Page_getPieceInfo}, + {"getSeparationInfo", m_Page_getSeparationInfo}, + {"getResourceDict", m_Page_getResourceDict}, +- {"getAnnots", m_Page_getAnnots}, ++ {"getAnnots", m_Page_getAnnotsObject}, + {"getContents", m_Page_getContents}, + {"__tostring", m_Page__tostring}, + {NULL, NULL} // sentinel +@@ -2520,7 +2517,7 @@ + if (((PdfDocument *) uin->d)->doc->getXRef()->isOk()) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((PdfDocument *) uin->d)->doc->getDocInfo((Object *) uout->d); ++ *((Object *) uout->d) = ((PdfDocument *) uin->d)->doc->getDocInfo(); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -2538,7 +2535,7 @@ + if (((PdfDocument *) uin->d)->doc->getXRef()->isOk()) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((PdfDocument *) uin->d)->doc->getDocInfoNF((Object *) uout->d); ++ *((Object *) uout->d) = ((PdfDocument *) uin->d)->doc->getDocInfoNF(); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -2841,7 +2838,7 @@ + uout = new_Object_userdata(L); + uout->d = new Object(); + origin = (Object *) (((Attribute *) uin->d)->getValue()); +- origin->copy ( ((Object *)uout->d) ); ++ *((Object *) uout->d) = origin->copy(); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -3320,7 +3317,7 @@ + parent = root->findParentElement(i-1); + if (parent != NULL) { + uout = new_StructElement_userdata(L); +- uout->d = new StructElement( *parent ); ++ uout->d = (StructElement *) parent; + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -3370,7 +3367,7 @@ + gen = luaL_checkint(L, 3); + uout = new_Object_userdata(L); + uout->d = new Object(); +- ((XRef *) uin->d)->fetch(num, gen, (Object *) uout->d); ++ *((Object *) uout->d) = ((XRef *) uin->d)->fetch(num, gen); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +diff -ur source.orig/texk/web2c/luatexdir/lua/lpdfscannerlib.cc source/texk/web2c/luatexdir/lua/lpdfscannerlib.cc +--- source.orig/texk/web2c/luatexdir/lua/lpdfscannerlib.cc 2017-05-08 22:39:36.692708395 +0200 ++++ source/texk/web2c/luatexdir/lua/lpdfscannerlib.cc 2017-09-19 09:48:19.658021769 +0200 +@@ -634,7 +634,7 @@ + int i; + for (i=0;i<count;i++) { + Object *val = new Object(); +- arrayref->get(i, val); ++ *val = arrayref->get(i); + if (val->isStream()) { + ObjectList *rover = self->_streams; + ObjectList *item = (ObjectList *)priv_xmalloc (sizeof(ObjectList)); +diff -ur source.orig/texk/web2c/pdftexdir/pdftoepdf.cc source/texk/web2c/pdftexdir/pdftoepdf.cc +--- source.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2017-06-16 21:49:09.293857387 +0200 ++++ source/texk/web2c/pdftexdir/pdftoepdf.cc 2017-09-19 09:48:19.661355046 +0200 +@@ -84,31 +84,6 @@ + #define MASK_SUPPRESS_PTEX_PAGENUMBER 0x04 + #define MASK_SUPPRESS_PTEX_INFODICT 0x08 + +-// PdfObject encapsulates the xpdf Object type, +-// and properly frees its resources on destruction. +-// Use obj-> to access members of the Object, +-// and &obj to get a pointer to the object. +-// It is no longer necessary to call Object::free explicitely. +- +-class PdfObject { +- public: +- PdfObject() { // nothing +- } ~PdfObject() { +- iObject.free(); +- } +- Object *operator->() { +- return &iObject; +- } +- Object *operator&() { +- return &iObject; +- } +- private: // no copying or assigning +- PdfObject(const PdfObject &); +- void operator=(const PdfObject &); +- public: +- Object iObject; +-}; +- + // When copying the Resources of the selected page, all objects are copied + // recusively top-down. Indirect objects however are not fetched during + // copying, but get a new object number from pdfTeX and then will be +@@ -212,18 +187,6 @@ + delete pdf_doc; + } + +-// Replacement for +-// Object *initDict(Dict *dict1){ initObj(objDict); dict = dict1; return this; } +- +-static void initDictFromDict(PdfObject & obj, Dict * dict) +-{ +- obj->initDict(xref); +- for (int i = 0, l = dict->getLength(); i < l; i++) { +- Object obj1; +- obj->dictAdd(copyString(dict->getKey(i)), dict->getValNF(i, &obj1)); +- } +-} +- + // -------------------------------------------------------------------- + + static int addEncoding(GfxFont * gfont) +@@ -320,10 +283,10 @@ + + static void copyDictEntry(Object * obj, int i) + { +- PdfObject obj1; ++ Object obj1; + copyName(obj->dictGetKey(i)); + pdf_puts(" "); +- obj->dictGetValNF(i, &obj1); ++ obj1 = obj->dictGetValNF(i); + copyObject(&obj1); + pdf_puts("\n"); + } +@@ -376,17 +339,17 @@ + static void copyProcSet(Object * obj) + { + int i, l; +- PdfObject procset; ++ Object procset; + if (!obj->isArray()) + pdftex_fail("PDF inclusion: invalid ProcSet array type <%s>", + obj->getTypeName()); + pdf_puts("/ProcSet [ "); + for (i = 0, l = obj->arrayGetLength(); i < l; ++i) { +- obj->arrayGetNF(i, &procset); +- if (!procset->isName()) ++ procset = obj->arrayGetNF(i); ++ if (!procset.isName()) + pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>", +- procset->getTypeName()); +- copyName(procset->getName()); ++ procset.getTypeName()); ++ copyName(procset.getName()); + pdf_puts(" "); + } + pdf_puts("]\n"); +@@ -394,10 +357,29 @@ + + #define REPLACE_TYPE1C true + ++static bool embeddableFont(Object * fontdesc) ++{ ++ Object fontfile, ffsubtype; ++ ++ if (!fontdesc->isDict()) ++ return false; ++ fontfile = fontdesc->dictLookup("FontFile"); ++ if (fontfile.isStream()) ++ return true; ++ if (REPLACE_TYPE1C) { ++ fontfile = fontdesc->dictLookup("FontFile3"); ++ if (!fontfile.isStream()) ++ return false; ++ ffsubtype = fontfile.streamGetDict()->lookup("Subtype"); ++ return ffsubtype.isName() && !strcmp(ffsubtype.getName(), "Type1C"); ++ } ++ return false; ++} ++ + static void copyFont(char *tag, Object * fontRef) + { +- PdfObject fontdict, subtype, basefont, fontdescRef, fontdesc, charset, +- fontfile, ffsubtype, stemV; ++ Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset, ++ stemV; + GfxFont *gfont; + fd_entry *fd; + fm_entry *fontmap; +@@ -413,33 +395,39 @@ + } + // Only handle included Type1 (and Type1C) fonts; anything else will be copied. + // Type1C fonts are replaced by Type1 fonts, if REPLACE_TYPE1C is true. +- if (!fixedinclusioncopyfont && fontRef->fetch(xref, &fontdict)->isDict() +- && fontdict->dictLookup("Subtype", &subtype)->isName() +- && !strcmp(subtype->getName(), "Type1") +- && fontdict->dictLookup("BaseFont", &basefont)->isName() +- && fontdict->dictLookupNF("FontDescriptor", &fontdescRef)->isRef() +- && fontdescRef->fetch(xref, &fontdesc)->isDict() +- && (fontdesc->dictLookup("FontFile", &fontfile)->isStream() +- || (REPLACE_TYPE1C +- && fontdesc->dictLookup("FontFile3", &fontfile)->isStream() +- && fontfile->streamGetDict()->lookup("Subtype", +- &ffsubtype)->isName() +- && !strcmp(ffsubtype->getName(), "Type1C"))) +- && (fontmap = lookup_fontmap(basefont->getName())) != NULL) { ++ fontdict = fontRef->fetch(xref); ++ fontdesc = Object(objNull); ++ if (fontdict.isDict()) { ++ subtype = fontdict.dictLookup("Subtype"); ++ basefont = fontdict.dictLookup("BaseFont"); ++ fontdescRef = fontdict.dictLookupNF("FontDescriptor"); ++ if (fontdescRef.isRef()) { ++ fontdesc = fontdescRef.fetch(xref); ++ } ++ } ++ if (!fixedinclusioncopyfont && fontdict.isDict() ++ && subtype.isName() ++ && !strcmp(subtype.getName(), "Type1") ++ && basefont.isName() ++ && fontdescRef.isRef() ++ && fontdesc.isDict() ++ && embeddableFont(&fontdesc) ++ && (fontmap = lookup_fontmap(basefont.getName())) != NULL) { + // round /StemV value, since the PDF input is a float + // (see Font Descriptors in PDF reference), but we only store an + // integer, since we don't want to change the struct. +- fontdesc->dictLookup("StemV", &stemV); +- fd = epdf_create_fontdescriptor(fontmap, zround(stemV->getNum())); +- if (fontdesc->dictLookup("CharSet", &charset) && +- charset->isString() && is_subsetable(fontmap)) +- epdf_mark_glyphs(fd, charset->getString()->getCString()); ++ stemV = fontdesc.dictLookup("StemV"); ++ fd = epdf_create_fontdescriptor(fontmap, zround(stemV.getNum())); ++ charset = fontdesc.dictLookup("CharSet"); ++ if (!charset.isNull() && ++ charset.isString() && is_subsetable(fontmap)) ++ epdf_mark_glyphs(fd, charset.getString()->getCString()); + else + embed_whole_font(fd); +- addFontDesc(fontdescRef->getRef(), fd); ++ addFontDesc(fontdescRef.getRef(), fd); + copyName(tag); + gfont = GfxFont::makeFont(xref, tag, fontRef->getRef(), +- fontdict->getDict()); ++ fontdict.getDict()); + pdf_printf(" %d 0 R ", addFont(fontRef->getRef(), fd, + addEncoding(gfont))); + } else { +@@ -451,24 +439,24 @@ + + static void copyFontResources(Object * obj) + { +- PdfObject fontRef; ++ Object fontRef; + int i, l; + if (!obj->isDict()) + pdftex_fail("PDF inclusion: invalid font resources dict type <%s>", + obj->getTypeName()); + pdf_puts("/Font << "); + for (i = 0, l = obj->dictGetLength(); i < l; ++i) { +- obj->dictGetValNF(i, &fontRef); +- if (fontRef->isRef()) ++ fontRef = obj->dictGetValNF(i); ++ if (fontRef.isRef()) + copyFont(obj->dictGetKey(i), &fontRef); +- else if (fontRef->isDict()) { // some programs generate pdf with embedded font object ++ else if (fontRef.isDict()) { // some programs generate pdf with embedded font object + copyName(obj->dictGetKey(i)); + pdf_puts(" "); + copyObject(&fontRef); + } + else + pdftex_fail("PDF inclusion: invalid font in reference type <%s>", +- fontRef->getTypeName()); ++ fontRef.getTypeName()); + } + pdf_puts(">>\n"); + } +@@ -557,7 +545,7 @@ + + static void copyObject(Object * obj) + { +- PdfObject obj1; ++ Object obj1; + int i, l, c; + Ref ref; + char *p; +@@ -601,8 +589,8 @@ + } else if (obj->isArray()) { + pdf_puts("["); + for (i = 0, l = obj->arrayGetLength(); i < l; ++i) { +- obj->arrayGetNF(i, &obj1); +- if (!obj1->isName()) ++ obj1 = obj->arrayGetNF(i); ++ if (!obj1.isName()) + pdf_puts(" "); + copyObject(&obj1); + } +@@ -612,7 +600,7 @@ + copyDict(obj); + pdf_puts(">>"); + } else if (obj->isStream()) { +- initDictFromDict(obj1, obj->streamGetDict()); ++ obj1 = Object(obj->streamGetDict()); + pdf_puts("<<\n"); + copyDict(&obj1); + pdf_puts(">>\n"); +@@ -638,9 +626,8 @@ + InObj *r; + for (r = inObjList; r != 0; r = r->next) { + if (!r->written) { +- Object obj1; + r->written = 1; +- xref->fetch(r->ref.num, r->ref.gen, &obj1); ++ Object obj1 = xref->fetch(r->ref.num, r->ref.gen); + if (r->type == objFont) { + assert(!obj1.isStream()); + pdfbeginobj(r->num, 2); // \pdfobjcompresslevel = 2 is for this +@@ -656,7 +643,6 @@ + pdf_puts("\n"); + pdfendobj(); + } +- obj1.free(); + } + } + } +@@ -839,8 +825,8 @@ + Page *page; + Ref *pageRef; + Dict *pageDict; +- PdfObject contents, obj1, obj2, pageObj, dictObj; +- PdfObject groupDict; ++ Object contents, obj1, obj2, pageObj, dictObj; ++ Object groupDict; + bool writeSepGroup = false; + Object info; + char *key; +@@ -867,8 +853,8 @@ + encodingList = 0; + page = pdf_doc->doc->getCatalog()->getPage(epdf_selected_page); + pageRef = pdf_doc->doc->getCatalog()->getPageRef(epdf_selected_page); +- xref->fetch(pageRef->num, pageRef->gen, &pageObj); +- pageDict = pageObj->getDict(); ++ pageObj = xref->fetch(pageRef->num, pageRef->gen); ++ pageDict = pageObj.getDict(); + rotate = page->getRotate(); + PDFRectangle *pagebox; + // write the Page header +@@ -886,7 +872,7 @@ + pdf_printf("/%s.PageNumber %i\n", pdfkeyprefix, (int) epdf_selected_page); + } + if ((suppress_ptex_info & MASK_SUPPRESS_PTEX_INFODICT) == 0) { +- pdf_doc->doc->getDocInfoNF(&info); ++ info = pdf_doc->doc->getDocInfoNF(); + if (info.isRef()) { + // the info dict must be indirect (PDF Ref p. 61) + pdf_printf("/%s.InfoDict ", pdfkeyprefix); +@@ -942,14 +928,14 @@ + pdf_puts(stripzeros(s)); + + // Metadata validity check (as a stream it must be indirect) +- pageDict->lookupNF("Metadata", &dictObj); +- if (!dictObj->isNull() && !dictObj->isRef()) ++ dictObj = pageDict->lookupNF("Metadata"); ++ if (!dictObj.isNull() && !dictObj.isRef()) + pdftex_warn("PDF inclusion: /Metadata must be indirect object"); + + // copy selected items in Page dictionary except Resources & Group + for (i = 0; pageDictKeys[i] != NULL; i++) { +- pageDict->lookupNF(pageDictKeys[i], &dictObj); +- if (!dictObj->isNull()) { ++ dictObj = pageDict->lookupNF(pageDictKeys[i]); ++ if (!dictObj.isNull()) { + pdf_newline(); + pdf_printf("/%s ", pageDictKeys[i]); + copyObject(&dictObj); // preserves indirection +@@ -957,8 +943,8 @@ + } + + // handle page group +- pageDict->lookupNF("Group", &dictObj); +- if (!dictObj->isNull()) { ++ dictObj = pageDict->lookupNF("Group"); ++ if (!dictObj.isNull()) { + if (pdfpagegroupval == 0) { + // another pdf with page group was included earlier on the + // same page; copy the Group entry as is. See manual for +@@ -972,11 +958,11 @@ + copyObject(&dictObj); + } else { + // write Group dict as a separate object, since the Page dict also refers to it +- pageDict->lookup("Group", &dictObj); +- if (!dictObj->isDict()) ++ dictObj = pageDict->lookup("Group"); ++ if (!dictObj.isDict()) + pdftex_fail("PDF inclusion: /Group dict missing"); + writeSepGroup = true; +- initDictFromDict(groupDict, page->getGroup()); ++ groupDict = Object(page->getGroup()); + pdf_printf("/Group %ld 0 R\n", (long)pdfpagegroupval); + } + } +@@ -989,15 +975,15 @@ + pdftex_warn + ("PDF inclusion: /Resources missing. 'This practice is not recommended' (PDF Ref)"); + } else { +- initDictFromDict(obj1, page->getResourceDict()); +- if (!obj1->isDict()) ++ obj1 = Object(page->getResourceDict()); ++ if (!obj1.isDict()) + pdftex_fail("PDF inclusion: invalid resources dict type <%s>", +- obj1->getTypeName()); ++ obj1.getTypeName()); + pdf_newline(); + pdf_puts("/Resources <<\n"); +- for (i = 0, l = obj1->dictGetLength(); i < l; ++i) { +- obj1->dictGetVal(i, &obj2); +- key = obj1->dictGetKey(i); ++ for (i = 0, l = obj1.dictGetLength(); i < l; ++i) { ++ obj2 = obj1.dictGetVal(i); ++ key = obj1.dictGetKey(i); + if (strcmp("Font", key) == 0) + copyFontResources(&obj2); + else if (strcmp("ProcSet", key) == 0) +@@ -1009,8 +995,8 @@ + } + + // write the page contents +- page->getContents(&contents); +- if (contents->isStream()) { ++ contents = page->getContents(); ++ if (contents.isStream()) { + + // Variant A: get stream and recompress under control + // of \pdfcompresslevel +@@ -1021,36 +1007,35 @@ + + // Variant B: copy stream without recompressing + // +- contents->streamGetDict()->lookup("F", &obj1); +- if (!obj1->isNull()) { ++ obj1 = contents.streamGetDict()->lookup("F"); ++ if (!obj1.isNull()) { + pdftex_fail("PDF inclusion: Unsupported external stream"); + } +- contents->streamGetDict()->lookup("Length", &obj1); +- assert(!obj1->isNull()); ++ obj1 = contents.streamGetDict()->lookup("Length"); ++ assert(!obj1.isNull()); + pdf_puts("/Length "); + copyObject(&obj1); + pdf_puts("\n"); +- contents->streamGetDict()->lookup("Filter", &obj1); +- if (!obj1->isNull()) { ++ obj1 = contents.streamGetDict()->lookup("Filter"); ++ if (!obj1.isNull()) { + pdf_puts("/Filter "); + copyObject(&obj1); + pdf_puts("\n"); +- contents->streamGetDict()->lookup("DecodeParms", &obj1); +- if (!obj1->isNull()) { ++ obj1 = contents.streamGetDict()->lookup("DecodeParms"); ++ if (!obj1.isNull()) { + pdf_puts("/DecodeParms "); + copyObject(&obj1); + pdf_puts("\n"); + } + } + pdf_puts(">>\nstream\n"); +- copyStream(contents->getStream()->getUndecodedStream()); ++ copyStream(contents.getStream()->getUndecodedStream()); + pdfendstream(); +- } else if (contents->isArray()) { ++ } else if (contents.isArray()) { + pdfbeginstream(); +- for (i = 0, l = contents->arrayGetLength(); i < l; ++i) { +- Object contentsobj; +- copyStream((contents->arrayGet(i, &contentsobj))->getStream()); +- contentsobj.free(); ++ for (i = 0, l = contents.arrayGetLength(); i < l; ++i) { ++ Object contentsobj = contents.arrayGet(i); ++ copyStream(contentsobj.getStream()); + if (i < l - 1) + pdf_newline(); // add a newline after each stream except the last + } +diff -ur source.orig/texk/web2c/pdftexdir/pdftosrc.cc source/texk/web2c/pdftexdir/pdftosrc.cc +--- source.orig/texk/web2c/pdftexdir/pdftosrc.cc 2017-06-16 21:49:09.297190679 +0200 ++++ source/texk/web2c/pdftexdir/pdftosrc.cc 2017-09-19 09:48:19.661355046 +0200 +@@ -86,22 +86,20 @@ + objgen = atoi(argv[3]); + } + xref = doc->getXRef(); +- catalogDict.initNull(); +- xref->getCatalog(&catalogDict); ++ catalogDict = xref->getCatalog(); + if (!catalogDict.isDict("Catalog")) { + fprintf(stderr, "No Catalog found\n"); + exit(1); + } +- srcStream.initNull(); ++ srcStream = Object(objNull); + if (objnum == 0) { +- catalogDict.dictLookup("SourceObject", &srcStream); ++ srcStream = catalogDict.dictLookup("SourceObject"); + static char const_SourceFile[] = "SourceFile"; + if (!srcStream.isStream(const_SourceFile)) { + fprintf(stderr, "No SourceObject found\n"); + exit(1); + } +- srcName.initNull(); +- srcStream.getStream()->getDict()->lookup("SourceName", &srcName); ++ srcName = srcStream.getStream()->getDict()->lookup("SourceName"); + if (!srcName.isString()) { + fprintf(stderr, "No SourceName found\n"); + exit(1); +@@ -110,7 +108,7 @@ + // We cannot free srcName, as objname shares its string. + // srcName.free(); + } else if (objnum > 0) { +- xref->fetch(objnum, objgen, &srcStream); ++ srcStream = xref->fetch(objnum, objgen); + if (!srcStream.isStream()) { + fprintf(stderr, "Not a Stream object\n"); + exit(1); +@@ -159,29 +157,26 @@ + int localOffset = 0; + Guint firstOffset; + +- assert(xref->fetch(e->offset, 0, &objStr)->isStream()); +- nObjects = objStr.streamGetDict()->lookup("N", &obj1)->getInt(); +- obj1.free(); +- first = objStr.streamGetDict()->lookup("First", &obj1)->getInt(); +- obj1.free(); ++ objStr = xref->fetch(e->offset, 0); ++ assert(objStr.isStream()); ++ obj1 = objStr.streamGetDict()->lookup("N"); ++ nObjects = obj1.getInt(); ++ obj1 = objStr.streamGetDict()->lookup("First"); ++ first = obj1.getInt(); + firstOffset = objStr.getStream()->getBaseStream()->getStart() + first; + + // parse the header: object numbers and offsets + objStr.streamReset(); +- obj1.initNull(); +- str = new EmbedStream(objStr.getStream(), &obj1, gTrue, first); ++ str = new EmbedStream(objStr.getStream(), Object(objNull), gTrue, first); + parser = new Parser(xref, new Lexer(xref, str), gFalse); + for (n = 0; n < nObjects; ++n) { +- parser->getObj(&obj1); +- parser->getObj(&obj2); ++ obj1 = parser->getObj(); ++ obj2 = parser->getObj(); + if (n == e->gen) + localOffset = obj2.getInt(); +- obj1.free(); +- obj2.free(); + } + while (str->getChar() != EOF) ; + delete parser; +- objStr.free(); + + fprintf(outfile, "%.10lu 00000 n\n", + (long unsigned)(firstOffset + localOffset)); +@@ -192,7 +187,6 @@ + s->reset(); + while ((c = s->getChar()) != EOF) + fputc(c, outfile); +- srcStream.free(); + } + if (objnum == 0) + fprintf(stderr, "Source file extracted to %s\n", outname); +@@ -201,7 +195,6 @@ + else + fprintf(stderr, "Cross-reference table extracted to %s\n", outname); + fclose(outfile); +- catalogDict.free(); + delete doc; + delete globalParams; + }

1 0

ports/opt (3.4): nvidia: updated to version 390.48
by crux＠crux.nu 30 Mar '18

30 Mar '18

commit b28747c14be62067a85496f38145c68370d23da3 Author: Matt Housh <jaeger(a)crux.ninja> Date: Thu Mar 29 17:42:53 2018 -0500 nvidia: updated to version 390.48 diff --git a/nvidia/.footprint b/nvidia/.footprint index a46e3abba..1576dede8 100644 --- a/nvidia/.footprint +++ b/nvidia/.footprint @@ -21,42 +21,42 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/nvidia-smi -rwxr-xr-x root/root usr/bin/nvidia-xconfig drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/libGL.so.390.42 -lrwxrwxrwx root/root usr/lib/libGL_so_1_2_nvidia -> libGL.so.390.42 +-rwxr-xr-x root/root usr/lib/libGL.so.390.48 +lrwxrwxrwx root/root usr/lib/libGL_so_1_2_nvidia -> libGL.so.390.48 lrwxrwxrwx root/root usr/lib/libOpenCL.so -> libOpenCL.so.1.0.0 -rwxr-xr-x root/root usr/lib/libOpenCL.so.1.0.0 --rwxr-xr-x root/root usr/lib/libcuda.so.390.42 -lrwxrwxrwx root/root usr/lib/libnvcuvid.so -> libnvcuvid.so.390.42 -lrwxrwxrwx root/root usr/lib/libnvcuvid.so.1 -> libnvcuvid.so.390.42 --rwxr-xr-x root/root usr/lib/libnvcuvid.so.390.42 --rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.390.42 --rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.390.42 --rwxr-xr-x root/root usr/lib/libnvidia-encode.so.390.42 --rwxr-xr-x root/root usr/lib/libnvidia-fatbinaryloader.so.390.42 --rwxr-xr-x root/root usr/lib/libnvidia-fbc.so.390.42 --rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.390.42 --rwxr-xr-x root/root usr/lib/libnvidia-gtk2.so.390.42 --rwxr-xr-x root/root usr/lib/libnvidia-gtk3.so.390.42 --rwxr-xr-x root/root usr/lib/libnvidia-ifr.so.390.42 -lrwxrwxrwx root/root usr/lib/libnvidia-ml.so -> libnvidia-ml.so.390.42 -lrwxrwxrwx root/root usr/lib/libnvidia-ml.so.1 -> libnvidia-ml.so.390.42 --rwxr-xr-x root/root usr/lib/libnvidia-ml.so.390.42 --rwxr-xr-x root/root usr/lib/libnvidia-opencl.so.390.42 --rwxr-xr-x root/root usr/lib/libnvidia-tls.so.390.42 +-rwxr-xr-x root/root usr/lib/libcuda.so.390.48 +lrwxrwxrwx root/root usr/lib/libnvcuvid.so -> libnvcuvid.so.390.48 +lrwxrwxrwx root/root usr/lib/libnvcuvid.so.1 -> libnvcuvid.so.390.48 +-rwxr-xr-x root/root usr/lib/libnvcuvid.so.390.48 +-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.390.48 +-rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.390.48 +-rwxr-xr-x root/root usr/lib/libnvidia-encode.so.390.48 +-rwxr-xr-x root/root usr/lib/libnvidia-fatbinaryloader.so.390.48 +-rwxr-xr-x root/root usr/lib/libnvidia-fbc.so.390.48 +-rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.390.48 +-rwxr-xr-x root/root usr/lib/libnvidia-gtk2.so.390.48 +-rwxr-xr-x root/root usr/lib/libnvidia-gtk3.so.390.48 +-rwxr-xr-x root/root usr/lib/libnvidia-ifr.so.390.48 +lrwxrwxrwx root/root usr/lib/libnvidia-ml.so -> libnvidia-ml.so.390.48 +lrwxrwxrwx root/root usr/lib/libnvidia-ml.so.1 -> libnvidia-ml.so.390.48 +-rwxr-xr-x root/root usr/lib/libnvidia-ml.so.390.48 +-rwxr-xr-x root/root usr/lib/libnvidia-opencl.so.390.48 +-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.390.48 drwxr-xr-x root/root usr/lib/tls/ --rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.390.42 +-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.390.48 drwxr-xr-x root/root usr/lib/vdpau/ -lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.390.42 -lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.390.42 --rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.390.42 +lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.390.48 +lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.390.48 +-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.390.48 drwxr-xr-x root/root usr/lib/xorg/ drwxr-xr-x root/root usr/lib/xorg/modules/ drwxr-xr-x root/root usr/lib/xorg/modules/drivers/ -rwxr-xr-x root/root usr/lib/xorg/modules/drivers/nvidia_drv.so drwxr-xr-x root/root usr/lib/xorg/modules/extensions/ --rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.390.42 -lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.390.42 --rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.390.42 +-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.390.48 +lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.390.48 +-rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.390.48 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/applications/ -rw-r--r-- root/root usr/share/applications/nvidia-settings.desktop @@ -67,6 +67,6 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/nvidia-smi.1.gz -rw-r--r-- root/root usr/share/man/man1/nvidia-xconfig.1.gz drwxr-xr-x root/root usr/share/nvidia/ --rw-r--r-- root/root usr/share/nvidia/nvidia-application-profiles-390.42-key-documentation +-rw-r--r-- root/root usr/share/nvidia/nvidia-application-profiles-390.48-key-documentation drwxr-xr-x root/root usr/share/pixmaps/ -rw-r--r-- root/root usr/share/pixmaps/nvidia-settings.png diff --git a/nvidia/.md5sum b/nvidia/.md5sum index 7a5f53acf..6fd3d9de7 100644 --- a/nvidia/.md5sum +++ b/nvidia/.md5sum @@ -1,2 +1,2 @@ 4511024cc556d0c6e7c467b6789524e2 90-nvidia-uvm.rules -2b2e4c8b4174b542774d82c66ba69e91 NVIDIA-Linux-x86_64-390.42-no-compat32.run +8ed67fc67710b6cfd9c9273054e2117a NVIDIA-Linux-x86_64-390.48-no-compat32.run diff --git a/nvidia/.signature b/nvidia/.signature index 8c8579fca..341c216f6 100644 --- a/nvidia/.signature +++ b/nvidia/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bZr35sOUGMXtWKOaDnhm9qF/TbO5zcNrk11XIjZicv6a+9JAsj7Wl8YMjy3p382wrPBRcrYbO/yeqUA3vVLuAU= -SHA256 (Pkgfile) = 8ff5cbe4edd2c1fff6cc6c85547301a4561e081439ae8e6fd2f03f3809d52f3e -SHA256 (.footprint) = d2bc0bb6cc75dc7e5fcecf26f241a640daf51573b1f8b240e36650f7d3734c12 -SHA256 (NVIDIA-Linux-x86_64-390.42-no-compat32.run) = 5f242cf0f7f4dcc45759eee3b4973191114842fe7c146c5ae7a12a2ebea394aa +RWSE3ohX2g5d/T302pDT/JptIxZSDzYCV2XHm74ZySJHopL7JmttRIqBgyvnQQXvarvH71/Vuc4Q7htIuF25F4VMr/szc7jJUwQ= +SHA256 (Pkgfile) = 8d8098209c6e8cfac083c5086d11017c4a6a87972a599407e03dbdaa721d68c3 +SHA256 (.footprint) = bfb5d799b1db4c2e2b7ab8f6780619b929a9ab2cdf461b221e823ee9f3c08287 +SHA256 (NVIDIA-Linux-x86_64-390.48-no-compat32.run) = 2d4bf72801f101a85df6fd1464021380ad51f5a30df05dadaf1fb546a175a441 SHA256 (90-nvidia-uvm.rules) = c35c61cebf5bf9a112ac06539bdc670a388afa4b50a7f8223a114fbeafedb140 diff --git a/nvidia/Pkgfile b/nvidia/Pkgfile index e3cde779d..bb5e29d91 100644 --- a/nvidia/Pkgfile +++ b/nvidia/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gtk gl-select name=nvidia -version=390.42 +version=390.48 release=1 source=(http://us.download.nvidia.com/XFree86/Linux-x86_64/$version/NVIDIA-… \ 90-nvidia-uvm.rules)

1 0