diff options
Diffstat (limited to 'abs/core')
63 files changed, 752 insertions, 973 deletions
diff --git a/abs/core/LinHES-config/LinHES-release b/abs/core/LinHES-config/LinHES-release index 4d73023..f578cec 100644 --- a/abs/core/LinHES-config/LinHES-release +++ b/abs/core/LinHES-config/LinHES-release @@ -1 +1 @@ -LinHES R8.4.2 (Breaking Ground) +LinHES R8.4.3 (Breaking Ground) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index f67f84d..b49c6b9 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config -pkgver=8.4.2 -pkgrel=5 +pkgver=8.4.3 +pkgrel=3 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -141,14 +141,14 @@ package() { install -o root -g root -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf } -md5sums=('97b810ddc35d1f441dbe8cdd6886e2af' +md5sums=('fe70208a7c11f7e2115655ad0004ddaf' '51525188ac6f6034422c5d71d0c84408' 'f6e9dd7bc6cf0aaa3bd203dab4cb79b9' '2596460462cf6c889cf8f95485537b20' '985891a43f7c4c983eb2a362162f1a0f' - '261ba62515edd7a13d46cbeb1b0eadca' + '78ff21d5babfb52caa4985f3bae4f5af' '6821fdfacf2aac44275200d3acaadb56' - 'f73d6d6f98839e900cb6685bf5dc4eae' + 'b1427dcdbba2ed2924a86a5a1d1cd6a3' '27e4fcacca9b9662dd782fbdc92fceea' '2a7f3b34e522acfd08283b86c8926aba' 'b596d2e3779a434435bc0f0277b1ba3e' @@ -156,7 +156,7 @@ md5sums=('97b810ddc35d1f441dbe8cdd6886e2af' 'f0376c98a7986897406d393186c0365e' '157e73d0f90d7b306aba8f5921aeedd3' '1f58c0393a131f4a8f9a84b3fe08a7e4' - '5c9fcb4cf5fb736df89ad60ca2e694f3' + 'cd8de15b472f29557e91e6e61084f91f' '5f890ea9bda6aef652d2560ca19dac07' 'ab2aa42c2947148c2b1cac0ade6d1d55' 'd429b59d3cfb37b0624c6a4a71a7c2c0' @@ -180,7 +180,7 @@ md5sums=('97b810ddc35d1f441dbe8cdd6886e2af' 'b79fe6ef82b0b5e71d62806e773ed556' '3cb673adb83b6afa52cffaa621b9d96b' '781f161a79c3188a31c8615b8258b241' - '888a6c57f272d9fa3e77e216a421562b' + 'dc56af9523253917c9feee0f083b4781' '6cb0aac63623a44463c4209862d2baa0' 'cdd5008ee77e67c1d51ad73a24612485' '2596460462cf6c889cf8f95485537b20' diff --git a/abs/core/LinHES-config/install_proxy.sh b/abs/core/LinHES-config/install_proxy.sh index 7d987f5..35b911d 100755 --- a/abs/core/LinHES-config/install_proxy.sh +++ b/abs/core/LinHES-config/install_proxy.sh @@ -24,7 +24,7 @@ progress () { then echo "" > /tmp/.install_percent else - echo "${mypercent}% complete" > /tmp/.install_percent + echo "${mypercent}% Complete" > /tmp/.install_percent fi } diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py index ed3e342..11af990 100644 --- a/abs/core/LinHES-config/mv_install.py +++ b/abs/core/LinHES-config/mv_install.py @@ -52,7 +52,7 @@ def update_db(value, data): logging.debug("Unable to update database with %s, %s", data, value) def progress(pgnum): - progressline = str(pgnum) + "% complete" + progressline = str(pgnum) + "% Complete" logging.debug("Progress: %s", pgnum) f = open('/tmp/.install_percent', 'w') f.write(progressline) @@ -630,7 +630,7 @@ def format_disk(install_type): def mount_it(): logging.info("______Mounting disk______") -# Create mount points + # Create mount points try: mountpoint = data_config.MOUNTPOINT mp = mountpoint @@ -744,116 +744,38 @@ def create_squashlist(): f.close() def mount_for_copy_it(): - mounts = {} + #Use static build mount and umount from mount2.28.2.tar.xz + #Versions of util-linux mount after 2.28.2 do not allow 1 image to be + # mounted to multiple loop devices. + #Our ISO mounts airootfs.img to both / and /image_mount + cmd = 'tar -xvf /tmp/mount2.28.2.tar.xz -C /tmp/' + rc = runcmd(cmd)[0] + if rc != 0 : + error_out("Failed to extract static mount from /tmp/mount2.28.2.tar.xz") - #mounts['/image_mount/root'] = 'root-image' - #mounts['/image_mount/usr/share'] = 'usr-share' - #mounts['/image_mount/lib/modules'] = 'lib-modules' - #mounts['/image_mount/var/lib/pacman'] = 'var-lib-pacman' - #mounts['/image_mount/data/storage/disk0/pacman/pkg'] = 'data-storage-disk0-pacman-pkg' - #mounts['/image_mount/var/cache/pacman'] = 'var-cache-pacman' + mounts = {} mounts['/image_mount'] = 'airootfs' for image_mount, fsimage in mounts.iteritems(): try: os.makedirs(image_mount) except: pass - #cmd = 'mount /run/archiso/sfs/%s/%s.fs %s' %(fsimage,fsimage,image_mount) - cmd = 'mount /run/archiso/sfs/%s/%s.img %s' %(fsimage,fsimage,image_mount) + cmd = '/tmp/mount /run/archiso/sfs/%s/%s.img %s' %(fsimage,fsimage,image_mount) rc = runcmd(cmd)[0] if rc != 0 : error_out("Mount image %s" %fsimage) - - - #image_mount='/image_mount/root' - #try: - #os.makedirs(image_mount) - #except: - #pass - - #image_mount='/image_mount/usr/share' - #try: - #os.makedirs(image_mount) - #except: - #pass - - #image_mount='/image_mount/lib/modules' - #try: - #os.makedirs(image_mount) - #except: - #pass - - #image_mount='/image_mount/var/cache/pacman' - #try: - #os.makedirs(image_mount) - #except: - #pass - - #image_mount='/image_mount/var/lib/pacman' - #try: - #os.makedirs(image_mount) - #except: - #pass - - - #fsimage='root-image' - #cmd = 'mount /run/archiso/sfs/%s/%s.fs /image_mount/root' %(fsimage,fsimage) - #rc = runcmd(cmd)[0] - #if rc != 0 : - #error_out("Mount image root") - - #fsimage='lib-modules' - #cmd = 'mount /run/archiso/sfs/%s/%s.fs /image_mount/lib/modules' %(fsimage,fsimage) - #rc = runcmd(cmd)[0] - #if rc != 0 : - #error_out("Mount image lib-modules") - - #fsimage='usr-share' - #cmd = 'mount /run/archiso/sfs/%s/%s.fs /image_mount/usr/share' %(fsimage,fsimage) - #rc = runcmd(cmd)[0] - #if rc != 0 : - #error_out("Mount image usr share") - - #fsimage='var-lib-pacman' - #cmd = 'mount /run/archiso/sfs/%s/%s.fs /image_mount/var/lib/pacman' %(fsimage,fsimage) - #rc = runcmd(cmd)[0] - #if rc != 0 : - #error_out("Mount image var-lib-pacman") - - #fsimage='var-cache-pacman' - #cmd = 'mount /run/archiso/sfs/%s/%s.fs /image_mount/var/cache/pacman' %(fsimage,fsimage) - #rc = runcmd(cmd)[0] - #if rc != 0 : - #error_out("Mount image var-cahce-pacman") - - def umount_for_copy_it(): mounts = {} mounts['/image_mount'] = 'airootfs' - - - #mounts['/image_mount/root'] = 'root-image' - #mounts['/image_mount/usr/share'] = 'usr-share' - #mounts['/image_mount/lib/modules'] = 'lib-modules' - #mounts['/image_mount/var/lib/pacman'] = 'var-lib-pacman' - #mounts['/image_mount/data/storage/disk0/pacman/pkg'] = 'data-storage-disk0-pacman-pkg' - #mounts['/image_mount/var/cache/pacman'] = 'var-cache-pacman' - - - for image_mount, fsimage in mounts.iteritems(): - #cmd = 'mount /run/archiso/sfs/%s/%s.fs %s' %(fsimage,fsimage,image_mount) - cmd='umount %s' %(image_mount) + cmd='/tmp/umount %s' %(image_mount) rc = runcmd(cmd)[0] if rc != 0 : error_out("unMount image %s" %image_mount) - - - def copy_it(install_type): logging.info("______Transferring to disk______") mount_for_copy_it() @@ -861,25 +783,8 @@ def copy_it(install_type): logging.debug( install_type) if ( install_type == "install"): logging.info("Transferring system") - #cmdlist = ['rsync -arp /image_mount/root/* /new_boot', - ##'rsync -arp /image_mount/lib/* /new_boot/lib/', - #'rsync -arp /image_mount/lib /new_boot/', - #'rsync -arp /image_mount/lib64 /new_boot/', - #'rsync -arp /image_mount/usr /new_boot', - #'rsync -arp /image_mount/sbin /new_boot', - #'rsync -arp /image_mount/bin /new_boot', - #'rsync -arp /image_mount/var /new_boot', - #'rsync -arp /image_mount/data/storage/disk0/* /new_boot/data/storage/disk0/', - #'rysnc -arp /image_mount/var-lib-pacman/sync /new_boot/var/lib/pacman/' - #] - - #cmdlist = ['rsync -arp --exclude var-lib-pacman --exclude boot-orig /image_mount/* /new_boot', - # 'rsync -arp /image_mount/var-lib-pacman/sync /new_boot/var/lib/pacman/', - # 'rsync -arp /image_mount/boot-orig/* /new_boot/boot/ ' - # ] - - - cmdlist = ['rsync -arp --exclude var-lib-pacman --exclude boot-orig /image_mount/* /new_boot'] + + cmdlist = ['rsync -arp --exclude var-lib-pacman --exclude boot-orig --exclude tmp/mount2.28.2.tar.xz /image_mount/* /new_boot'] for cmd in cmdlist: rc = runcmd(cmd)[0] @@ -891,16 +796,9 @@ def copy_it(install_type): if ( install_type == "upgrade"): logging.info("Upgrading system") - #cmdlist = ['rsync -arp --exclude /home --exclude /data/srv/mysql /image_mount/root/* /new_boot', - #'rsync -arp /image_mount/lib/* /new_boot/lib/', - #'rsync -arp /image_mount/usr /new_boot', - #'rsync -arp /image_mount/var /new_boot'] - - cmdlist = ['rsync -arp --exclude var-lib-pacman --exclude boot-orig --exclude /home --exclude /data/srv/mysql /image_mount/* /new_boot'] - + cmdlist = ['rsync -arp --exclude var-lib-pacman --exclude boot-orig --exclude tmp/mount2.28.2.tar.xz --exclude /home --exclude /data/srv/mysql /image_mount/* /new_boot'] for cmd in cmdlist: - #runcmd(cmd) rc = runcmd(cmd)[0] if rc != 0 : error_out("Running %s" %cmd) @@ -925,10 +823,7 @@ def copy_it(install_type): cp_and_log("/var/lib/dhcpcd/*.lease", data_config.MOUNTPOINT+"/var/lib/dhcpcd/") - - - -# General fixup + # General fixup cmd = "chmod 777 %s/tmp" %(data_config.MOUNTPOINT) runcmd(cmd) cmd = "chmod 1777 %s/var/lock" %(data_config.MOUNTPOINT) @@ -951,7 +846,6 @@ def copy_it(install_type): runcmd(cmd) - #sys.exit(3) apply_pristine() post_process() diff --git a/abs/core/LinHES-config/systemconfig.py b/abs/core/LinHES-config/systemconfig.py index c7cbb8a..ef5fef1 100755 --- a/abs/core/LinHES-config/systemconfig.py +++ b/abs/core/LinHES-config/systemconfig.py @@ -467,13 +467,4 @@ if __name__ == "__main__": for i in systemconfig.items(): logging.debug(i) #pass - - - - - - - - - - + logging.debug("______END OF DEBUG______") diff --git a/abs/core/LinHES-config/systemconfig.sh b/abs/core/LinHES-config/systemconfig.sh index 76194dd..8e79f75 100755 --- a/abs/core/LinHES-config/systemconfig.sh +++ b/abs/core/LinHES-config/systemconfig.sh @@ -4,6 +4,7 @@ #Any changes made to config files will be removed when systemconfig.sh is run # #JM +MYTH_RUN_STATUS="1" echo $@ >/tmp/systemconfig.call echo "----------------------start of systemconfig $@ ----------------------" . /etc/profile @@ -23,8 +24,5 @@ postfix=`cat ${BASE}/usr/local/share/mythtv/.releasetype` systemconfig.py -m $@ rc=$? -echo "systemconfig.py exit code $rc" +echo "systemconfig.py exit code $rc" | tee -a /tmp/systemconfig.call exit $rc - - - diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 9cc6e8b..2ae0063 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,11 +1,11 @@ pkgname=LinHES-system pkgver=8.4 -pkgrel=17 +pkgrel=19 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" license=('GPL2') -depends=('linhes-sounds' 'xdotool' 'tilda' 'keylaunch' +depends=('linhes-sounds' 'xdotool' 'tilda' 'keylaunch' 'dvdbackup' 'python_aosd' 'udisks' 'LinHES-config>=2.3-59' 'sudo' 'python2-dbus' 'unclutter' 'wmctrl' 'archlinux-xdg-menu' 'ethtool' 'gnu-netcat' 'normalize' 'ttf-overlock' @@ -84,7 +84,7 @@ md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac' 'de32a1c50101265dd7f6ca5037f7a26a' '2d7b8414ddce5f401331342ac1529c22' '76b2637cac0452b3acdbeeb4e8a5474b' - '8e5d224788154fea8639a37eecdaefd9' + '2ee4c6b06d40f2f6058e480d231f60b2' 'dc3eef2a624754e16805d72bbe488b67' '617af86b901538817ebdcaf646248dc5' '542e670e78d117657f93141e9689f54d' diff --git a/abs/core/LinHES-system/myth_mtc.py b/abs/core/LinHES-system/myth_mtc.py index e62592f..b157f01 100755 --- a/abs/core/LinHES-system/myth_mtc.py +++ b/abs/core/LinHES-system/myth_mtc.py @@ -35,15 +35,21 @@ def check_home(): freePcent = getFreePercentForDir(data_config.MYTHHOME) print " Home directory percent used: " + str(freePcent * 100) + "%" if float(freePcent) > .9: - print " Home directory is greater than 90% used. Clearing MythTV caches..." - cmd = "/usr/bin/rm -rf " + data_config.MYTHHOME + "/.mythtv/{*cache,Cache-*}" + print " Home directory is greater than 90% used. Clearing caches..." + cmd = "/usr/bin/rm -rf " + data_config.MYTHHOME + "/.mythtv/{*cache,Cache-*,tmp/*,MythMusic/AlbumArt/*}" subprocess.call(["sh", "-c", cmd]) print " Restarting mythfrontend..." subprocess.call(["killall", "mythfrontend"]) + cmd = "/usr/bin/rm -rf " + data_config.MYTHHOME + "/.cache/*" + subprocess.call(["sh", "-c", cmd]) + cmd = "/usr/bin/rm -rf " + data_config.MYTHHOME + "/.plexht/userdata/Thumbnails/*" + subprocess.call(["sh", "-c", cmd]) + cmd = "/usr/bin/rm -rf " + data_config.MYTHHOME + "/.plexht/userdata/ThemeMusicCache/*" + subprocess.call(["sh", "-c", cmd]) freePcent = getFreePercentForDir(data_config.MYTHHOME) print " Home directory percent used: " + str(freePcent * 100) + "%" else: - print " Home directory is less than 90% used. Not clearing MythTV caches." + print " Home directory is less than 90% used. Not clearing caches." return 0 def optimize(): diff --git a/abs/core/ffmpeg/PKGBUILD b/abs/core/ffmpeg/PKGBUILD index 541249f..4e9be79 100644 --- a/abs/core/ffmpeg/PKGBUILD +++ b/abs/core/ffmpeg/PKGBUILD @@ -6,28 +6,29 @@ # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=3.0.2 +pkgver=3.2.2 pkgrel=2 epoch=1 pkgdesc='Complete solution to record, convert and stream audio and video' arch=('i686' 'x86_64') url='http://ffmpeg.org/' license=('GPL3') -depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame' - 'libass' 'libavc1394' 'libbluray' 'libiec61883' 'libmodplug' - 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau' 'libwebp' - 'netcdf' 'opencore-amr' 'openjpeg' 'opus' 'schroedinger' 'sdl' 'speex' - 'v4l-utils' 'xvidcore' 'zlib' - 'libdcadec.so' 'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so' - 'libvpx.so' 'libx264.so' 'libx265.so') +depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm' + 'lame' 'libavc1394' 'libiec61883' 'libmodplug' + 'libraw1394' 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau' + 'libwebp' 'libx11' 'libxcb' 'opencore-amr' 'openjpeg2' 'opus' + 'schroedinger' 'sdl2' 'speex' 'v4l-utils' 'xz' 'zlib' + 'libass.so' 'libbluray.so' 'libfreetype.so' 'libnetcdf.so' + 'libvidstab.so' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' + 'libx264.so' 'libx265.so' 'libxvidcore.so') makedepends=('hardening-wrapper' 'ladspa' 'libvdpau' 'yasm') optdepends=('ladspa: LADSPA filters') provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' 'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' 'libswscale.so') -source=(http://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.bz2{,.asc}) +source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}) validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') -sha256sums=('30e3c77c2f4c358ed087869455a7496cbd7753a5e1b98d20ba49c1004009fd36' +sha256sums=('3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc' 'SKIP') build() { @@ -41,12 +42,12 @@ build() { --enable-avisynth \ --enable-avresample \ --enable-fontconfig \ + --enable-gmp \ --enable-gnutls \ --enable-gpl \ --enable-ladspa \ --enable-libass \ --enable-libbluray \ - --enable-libdcadec \ --enable-libfreetype \ --enable-libfribidi \ --enable-libgsm \ diff --git a/abs/core/ffmpeg/__changelog b/abs/core/ffmpeg/__changelog index 7d491f4..abc2a13 100644 --- a/abs/core/ffmpeg/__changelog +++ b/abs/core/ffmpeg/__changelog @@ -1 +1,2 @@ PKGBUILD - remove libpulse dep and disable-libpulse in configure +PDGBUILD - remove jack dep diff --git a/abs/core/fontconfig/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch b/abs/core/fontconfig/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch deleted file mode 100644 index 8c1e55d..0000000 --- a/abs/core/fontconfig/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e7121de237a1873c3241a5b8451e7d00a3d41524 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Fri, 3 Oct 2014 12:26:42 +0900 -Subject: Revert "Bug 73291 - poppler does not show fl ligature" - -This reverts commit c6aa4d4bfcbed14f39d070fe7ef90a4b74642ee7. - -This issue has been fixed in poppler and we no longer need to patch it out in fontconfig. - -diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf -index 08c8ba3..49a9602 100644 ---- a/conf.d/30-metric-aliases.conf -+++ b/conf.d/30-metric-aliases.conf -@@ -77,15 +77,12 @@ but in an order preferring similar designs first. We do this in three steps: - </default> - </alias> - --<!-- -- Due to Bug#73291, commented out those lines until the broken font are fixed. - <alias binding="same"> - <family>TeX Gyre Termes</family> - <default> - <family>Times</family> - </default> - </alias> ----> - - <alias binding="same"> - <family>Nimbus Mono L</family> -@@ -418,10 +415,7 @@ but in an order preferring similar designs first. We do this in three steps: - <alias binding="same"> - <family>Times</family> - <accept> --<!-- -- Due to Bug#73291, commented out this line until the broken font are fixed. - <family>TeX Gyre Termes</family> ----> - <family>Nimbus Roman No9 L</family> - </accept> - </alias> --- -cgit v0.10.2 - diff --git a/abs/core/fontconfig/0001-fix-test-with-freetype2-2.7.1.patch b/abs/core/fontconfig/0001-fix-test-with-freetype2-2.7.1.patch new file mode 100644 index 0000000..d834b70 --- /dev/null +++ b/abs/core/fontconfig/0001-fix-test-with-freetype2-2.7.1.patch @@ -0,0 +1,42 @@ +From 165f0f012f8d4bebb12d188c1c2a369d233d586e Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Tue, 10 Jan 2017 10:01:54 +0100 +Subject: [PATCH 1/1] fix test with freetype2 2.7.1 + +Upstream freetype2 applied a patch from openSuSE [0]: + +[pcf] Enrich family name with foundry name and glyph width info. +3576487add2f0e9691e8c43f8b0cd8e61aebf14f + +This prepends the foundry name plus a space to the family name. We needs +change the font name in expexted test output. + +[0] http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=3576487add2f0e9691e8c43f8b0cd8e61aebf14f + +Signed-off-by: Christian Hesse <mail@eworm.de> +--- + test/out.expected | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/test/out.expected b/test/out.expected +index 39634c5..f3a8856 100644 +--- a/test/out.expected ++++ b/test/out.expected +@@ -1,8 +1,8 @@ +-Fixed:pixelsize=16 +-Fixed:pixelsize=6 ++Misc Fixed:pixelsize=6 ++Sony Fixed:pixelsize=16 + = +-Fixed:pixelsize=16 +-Fixed:pixelsize=6 ++Misc Fixed:pixelsize=6 ++Sony Fixed:pixelsize=16 + = +-Fixed:pixelsize=16 +-Fixed:pixelsize=6 ++Misc Fixed:pixelsize=6 ++Sony Fixed:pixelsize=16 +-- +2.11.0 + diff --git a/abs/core/fontconfig/0002-Update-aliases-for-new-URW-fonts.patch b/abs/core/fontconfig/0002-Update-aliases-for-new-URW-fonts.patch deleted file mode 100644 index 58df7ea..0000000 --- a/abs/core/fontconfig/0002-Update-aliases-for-new-URW-fonts.patch +++ /dev/null @@ -1,308 +0,0 @@ -From b732bf057f4b3ec3bac539803005e9c42d056b2a Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Thu, 6 Nov 2014 13:15:09 +0900 -Subject: Update aliases for new URW fonts - -Patch from Tom Yan - -https://bugs.freedesktop.org/show_bug.cgi?id=85225 - -diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf -index 49a9602..cd1e924 100644 ---- a/conf.d/30-metric-aliases.conf -+++ b/conf.d/30-metric-aliases.conf -@@ -6,17 +6,17 @@ - - Alias similar/metric-compatible families from various sources: - --PostScript fonts: URW fonts: GUST fonts: Windows fonts: --====================== ==================== ================= ================== --Helvetica Nimbus Sans L TeX Gyre Heros --Helvetica Condensed TeX Gyre Heros Cn --Times Nimbus Roman No9 L TeX Gyre Termes --Courier Nimbus Mono L TeX Gyre Cursor --ITC Avant Garde Gothic URW Gothic L TeX Gyre Adventor --ITC Bookman URW Bookman L TeX Gyre Bonum Bookman Old Style --ITC Zapf Chancery URW Chancery L TeX Gyre Chorus --Palatino URW Palladio L TeX Gyre Pagella Palatino Linotype --New Century Schoolbook Century Schoolbook L TeX Gyre Schola Century Schoolbook -+PostScript fonts: URW fonts: GUST fonts: Windows fonts: -+====================== ====================== ================= ================== -+Helvetica Nimbus Sans TeX Gyre Heros -+Helvetica Condensed Nimbus Sans Narrow TeX Gyre Heros Cn -+Times Nimbus Roman TeX Gyre Termes -+Courier Nimbus Mono TeX Gyre Cursor -+ITC Avant Garde Gothic URW Gothic TeX Gyre Adventor -+ITC Bookman Bookman URW TeX Gyre Bonum Bookman Old Style -+ITC Zapf Chancery Chancery URW TeX Gyre Chorus -+Palatino Palladio URW TeX Gyre Pagella Palatino Linotype -+New Century Schoolbook Century SchoolBook URW TeX Gyre Schola Century Schoolbook - - Microsoft fonts: Liberation fonts: Google CrOS core fonts: StarOffice fonts: AMT fonts: - ================ ====================== ======================= ================= ============== -@@ -57,6 +57,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>Nimbus Sans</family> -+ <default> -+ <family>Helvetica</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Heros</family> - <default> - <family>Helvetica</family> -@@ -64,6 +71,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>Nimbus Sans Narrow</family> -+ <default> -+ <family>Helvetica Condensed</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Heros Cn</family> - <default> - <family>Helvetica Condensed</family> -@@ -78,6 +92,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>Nimbus Roman</family> -+ <default> -+ <family>Times</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Termes</family> - <default> - <family>Times</family> -@@ -92,6 +113,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>Nimbus Mono</family> -+ <default> -+ <family>Courier</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Cursor</family> - <default> - <family>Courier</family> -@@ -113,6 +141,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>URW Gothic</family> -+ <default> -+ <family>ITC Avant Garde Gothic</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Adventor</family> - <default> - <family>ITC Avant Garde Gothic</family> -@@ -134,6 +169,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>Bookman URW</family> -+ <default> -+ <family>ITC Bookman</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Bonum</family> - <default> - <family>ITC Bookman</family> -@@ -162,6 +204,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>Chancery URW</family> -+ <default> -+ <family>ITC Zapf Chancery</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Chorus</family> - <default> - <family>ITC Zapf Chancery</family> -@@ -176,6 +225,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>Palladio URW</family> -+ <default> -+ <family>Palatino</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Pagella</family> - <default> - <family>Palatino</family> -@@ -197,6 +253,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>Century SchoolBook URW</family> -+ <default> -+ <family>New Century Schoolbook</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Schola</family> - <default> - <family>New Century Schoolbook</family> -@@ -401,6 +464,7 @@ but in an order preferring similar designs first. We do this in three steps: - <family>Helvetica</family> - <accept> - <family>TeX Gyre Heros</family> -+ <family>Nimbus Sans</family> - <family>Nimbus Sans L</family> - </accept> - </alias> -@@ -409,6 +473,7 @@ but in an order preferring similar designs first. We do this in three steps: - <family>Helvetica Condensed</family> - <accept> - <family>TeX Gyre Heros Cn</family> -+ <family>Nimbus Sans Narrow</family> - </accept> - </alias> - -@@ -416,6 +481,7 @@ but in an order preferring similar designs first. We do this in three steps: - <family>Times</family> - <accept> - <family>TeX Gyre Termes</family> -+ <family>Nimbus Roman</family> - <family>Nimbus Roman No9 L</family> - </accept> - </alias> -@@ -424,6 +490,7 @@ but in an order preferring similar designs first. We do this in three steps: - <family>Courier</family> - <accept> - <family>TeX Gyre Cursor</family> -+ <family>Nimbus Mono</family> - <family>Nimbus Mono L</family> - </accept> - </alias> -@@ -432,6 +499,7 @@ but in an order preferring similar designs first. We do this in three steps: - <family>ITC Avant Garde Gothic</family> - <accept> - <family>TeX Gyre Adventor</family> -+ <family>URW Gothic</family> - <family>URW Gothic L</family> - </accept> - </alias> -@@ -441,6 +509,7 @@ but in an order preferring similar designs first. We do this in three steps: - <accept> - <family>Bookman Old Style</family> - <family>TeX Gyre Bonum</family> -+ <family>Bookman URW</family> - <family>URW Bookman L</family> - </accept> - </alias> -@@ -449,6 +518,7 @@ but in an order preferring similar designs first. We do this in three steps: - <family>ITC Zapf Chancery</family> - <accept> - <family>TeX Gyre Chorus</family> -+ <family>Chancery URW</family> - <family>URW Chancery L</family> - </accept> - </alias> -@@ -458,6 +528,7 @@ but in an order preferring similar designs first. We do this in three steps: - <accept> - <family>Palatino Linotype</family> - <family>TeX Gyre Pagella</family> -+ <family>Palladio URW</family> - <family>URW Palladio L</family> - </accept> - </alias> -@@ -467,6 +538,7 @@ but in an order preferring similar designs first. We do this in three steps: - <accept> - <family>Century Schoolbook</family> - <family>TeX Gyre Schola</family> -+ <family>Century SchoolBook URW</family> - <family>Century Schoolbook L</family> - </accept> - </alias> -diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf -index 996fb81..72490f3 100644 ---- a/conf.d/45-latin.conf -+++ b/conf.d/45-latin.conf -@@ -34,6 +34,10 @@ - <default><family>serif</family></default> - </alias> - <alias> -+ <family>Nimbus Roman</family> -+ <default><family>serif</family></default> -+ </alias> -+ <alias> - <family>Luxi Serif</family> - <default><family>serif</family></default> - </alias> -@@ -97,6 +101,10 @@ - <default><family>sans-serif</family></default> - </alias> - <alias> -+ <family>Nimbus Sans</family> -+ <default><family>sans-serif</family></default> -+ </alias> -+ <alias> - <family>Luxi Sans</family> - <default><family>sans-serif</family></default> - </alias> -@@ -151,6 +159,10 @@ - <family>Nimbus Mono L</family> - <default><family>monospace</family></default> - </alias> -+ <alias> -+ <family>Nimbus Mono</family> -+ <default><family>monospace</family></default> -+ </alias> - <!-- - Fantasy faces - --> -diff --git a/conf.d/60-latin.conf b/conf.d/60-latin.conf -index 2107e31..35600ea 100644 ---- a/conf.d/60-latin.conf -+++ b/conf.d/60-latin.conf -@@ -10,6 +10,7 @@ - <family>Thorndale AMT</family> - <family>Luxi Serif</family> - <family>Nimbus Roman No9 L</family> -+ <family>Nimbus Roman</family> - <family>Times</family> - </prefer> - </alias> -@@ -23,6 +24,7 @@ - <family>Albany AMT</family> - <family>Luxi Sans</family> - <family>Nimbus Sans L</family> -+ <family>Nimbus Sans</family> - <family>Helvetica</family> - <family>Lucida Sans Unicode</family> - <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor --> -@@ -40,6 +42,7 @@ - <family>Cumberland AMT</family> - <family>Luxi Mono</family> - <family>Nimbus Mono L</family> -+ <family>Nimbus Mono</family> - <family>Courier</family> - </prefer> - </alias> --- -cgit v0.10.2 - diff --git a/abs/core/fontconfig/PKGBUILD b/abs/core/fontconfig/PKGBUILD index 9f1fe17..e15ebc6 100644 --- a/abs/core/fontconfig/PKGBUILD +++ b/abs/core/fontconfig/PKGBUILD @@ -2,39 +2,33 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fontconfig -pkgver=2.11.1 -pkgrel=2 +pkgver=2.12.1 +pkgrel=4 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64) -url="http://www.fontconfig.org/release/" +url="https://www.freedesktop.org/wiki/Software/fontconfig/" license=('custom') depends=('expat' 'freetype2') +makedepends=('python2' 'docbook2x') install=fontconfig.install -source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2 - 0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch - 0002-Update-aliases-for-new-URW-fonts.patch) -sha256sums=('dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99' - '657d180d9d78555df4f1b81871ba9c1c7c6056c83455514950d064fdfae4646b' - '1194d1b92d228d8ed705f5502fdf4fcfad5a794f388bcb4928074df4c34a1bfb') +source=(https://www.freedesktop.org/software/$pkgname/release/$pkgname-$pkgver.tar.bz2 + fontconfig.hook + 0001-fix-test-with-freetype2-2.7.1.patch) +sha256sums=('b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3' + '672f6a1c5e164671955ce807e670306194142a1794ce88df653aa717a972e274' + 'b4992aab4e2b4ddae01f7565486752fa877edb6cd5ed435e15938ed21dfe22c8') - # a nice page to test font matching: - # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html +# a nice page to test font matching: +# http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html +# http://getemoji.com/ prepare() { cd $pkgname-$pkgver - - # Upstream patches implementing FS#45928 - patch -p1 -i ../0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch - patch -p1 -i ../0002-Update-aliases-for-new-URW-fonts.patch + patch -Np1 -i ../0001-fix-test-with-freetype2-2.7.1.patch } build() { cd $pkgname-$pkgver - - # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well - libtoolize -f - autoreconf -fi - ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-templatedir=/etc/fonts/conf.avail \ @@ -51,8 +45,14 @@ check() { make -k check } +_install_conf() { + install -m644 "$1" "$pkgdir/etc/fonts/conf.avail" + ln -s "../conf.avail/${1##*/}" "$pkgdir/etc/fonts/conf.d" +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 ../fontconfig.hook "$pkgdir/usr/share/libalpm/hooks/fontconfig.hook" } diff --git a/abs/core/fontconfig/fontconfig.hook b/abs/core/fontconfig/fontconfig.hook new file mode 100644 index 0000000..0f24bc4 --- /dev/null +++ b/abs/core/fontconfig/fontconfig.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/share/fonts/* + +[Action] +Description = Updating fontconfig cache... +When = PostTransaction +Exec = /usr/bin/fc-cache -s diff --git a/abs/core/fontconfig/fontconfig.install b/abs/core/fontconfig/fontconfig.install index 961bba5..1a80d04 100644 --- a/abs/core/fontconfig/fontconfig.install +++ b/abs/core/fontconfig/fontconfig.install @@ -18,16 +18,14 @@ post_install() { _EOF - echo -n "updating font cache... " - # a full forced directory scan is required here - /usr/bin/fc-cache -f - echo "done." + post_upgrade $1 } post_upgrade() { - echo -n "updating font cache... " - /usr/bin/fc-cache -f - echo "done." + echo -n "Updating font cache..." + # a full forced directory scan is required here + /usr/bin/fc-cache -rs + echo " done." } post_remove() { diff --git a/abs/core/freetype2/0001-Enable-table-validation-modules.patch b/abs/core/freetype2/0001-Enable-table-validation-modules.patch new file mode 100644 index 0000000..3e9451f --- /dev/null +++ b/abs/core/freetype2/0001-Enable-table-validation-modules.patch @@ -0,0 +1,34 @@ +From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Tue, 23 Jun 2015 08:40:29 +0200 +Subject: [PATCH 1/3] Enable table validation modules + +--- + modules.cfg | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules.cfg b/modules.cfg +index f30049c38cc45159..7b8e50fe1b34584a 100644 +--- a/modules.cfg ++++ b/modules.cfg +@@ -120,7 +120,7 @@ AUX_MODULES += cache + # TrueType GX/AAT table validation. Needs ftgxval.c below. + # + # No FT_CONFIG_OPTION_PIC support. +-# AUX_MODULES += gxvalid ++AUX_MODULES += gxvalid + + # Support for streams compressed with gzip (files with suffix .gz). + # +@@ -143,7 +143,7 @@ AUX_MODULES += bzip2 + # OpenType table validation. Needs ftotval.c below. + # + # No FT_CONFIG_OPTION_PIC support. +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # +-- +2.9.3 + diff --git a/abs/core/freetype2/0002-Enable-subpixel-rendering.patch b/abs/core/freetype2/0002-Enable-subpixel-rendering.patch new file mode 100644 index 0000000..dfb5796 --- /dev/null +++ b/abs/core/freetype2/0002-Enable-subpixel-rendering.patch @@ -0,0 +1,25 @@ +From 96f09f08417887b2618c177bccfb6da2906568d9 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Tue, 23 Jun 2015 08:43:07 +0200 +Subject: [PATCH 2/3] Enable subpixel rendering + +--- + include/freetype/config/ftoption.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h +index 90c123ef93e9ea04..67a361dd41e0b026 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -122,7 +122,7 @@ FT_BEGIN_HEADER + /* This is done to allow FreeType clients to run unmodified, forcing */ + /* them to display normal gray-level anti-aliased glyphs. */ + /* */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /*************************************************************************/ +-- +2.9.3 + diff --git a/abs/core/freetype2/0003-Enable-infinality-subpixel-hinting.patch b/abs/core/freetype2/0003-Enable-infinality-subpixel-hinting.patch new file mode 100644 index 0000000..bbfa2a2 --- /dev/null +++ b/abs/core/freetype2/0003-Enable-infinality-subpixel-hinting.patch @@ -0,0 +1,27 @@ +From 220e96a9a8d7aff6ad0f0f1aa12c79cdb563331c Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Mon, 29 Aug 2016 08:43:10 +0200 +Subject: [PATCH 3/3] Enable infinality subpixel hinting + +--- + include/freetype/config/ftoption.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h +index 67a361dd41e0b026..c4812862518b66a6 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -675,8 +675,8 @@ FT_BEGIN_HEADER + /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ + /* */ + /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */ +-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 +-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */ ++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */ ++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) + + + /*************************************************************************/ +-- +2.9.3 + diff --git a/abs/core/freetype2/0005-freetype-2.5.2-more-demos.patch b/abs/core/freetype2/0005-freetype-2.5.2-more-demos.patch new file mode 100644 index 0000000..e737cb7 --- /dev/null +++ b/abs/core/freetype2/0005-freetype-2.5.2-more-demos.patch @@ -0,0 +1,17 @@ +--- ft2demos-2.5.2/Makefile ++++ ft2demos-2.5.2/Makefile +@@ -296,10 +296,10 @@ else + # The following programs are not compiled automatically; either comment + # out the affected line or use the program name as a Makefile target. + # +- # EXES += ftchkwd +- # EXES += ftmemchk +- # EXES += ftpatchk +- # EXES += fttimer ++ EXES += ftchkwd ++ EXES += ftmemchk ++ EXES += ftpatchk ++ EXES += fttimer + # EXES += testname + + exes: $(EXES:%=$(BIN_DIR_2)/%$E) diff --git a/abs/core/freetype2/PKGBUILD b/abs/core/freetype2/PKGBUILD index a8236f6..80f5160 100644 --- a/abs/core/freetype2/PKGBUILD +++ b/abs/core/freetype2/PKGBUILD @@ -1,55 +1,95 @@ # $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=freetype2 -pkgver=2.5.3 -pkgrel=2 -pkgdesc="TrueType font rendering library" +pkgbase=freetype2 +pkgname=('freetype2' 'freetype2-demos') +pkgver=2.7.1 +pkgrel=1 arch=(i686 x86_64) license=('GPL') -url="http://freetype.sourceforge.net" -# adding harfbuzz for improved OpenType features auto-hinting +url="http://www.freetype.org/" +# adding harfbuzz for improved OpenType features auto-hinting # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream -depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz') -source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2{,.sig} - freetype-2.2.1-enable-valid.patch - freetype-2.5.1-enable-spr.patch - freetype-2.5.1-enable-sph.patch - fix_segfault_with_harfbuzz.diff) -sha1sums=('d3c26cc17ec7fe6c36f4efc02ef92ab6aa3f4b46' +makedepends=('libx11' 'zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz') +source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig} + https://download.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig} + https://download.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig} + 0001-Enable-table-validation-modules.patch + 0002-Enable-subpixel-rendering.patch + 0003-Enable-infinality-subpixel-hinting.patch + 0005-freetype-2.5.2-more-demos.patch + freetype2.sh) +sha1sums=('4d08a9a6567c6332d58e9a5f9a7e9e3fbce66789' 'SKIP' - 'f279d922a873d62a8af50bfc873051839d194dca' - '13ee8d558593db991ad29fa090b461f914536104' - 'c31fa3d342ead56f3acfa1f267b474a7686d0014' - 'c99013b4c19494cd26031878368191cd2b4459b0') + 'd8ce472cd775b8ce50d127689acab59181e72ecf' + 'SKIP' + '2ebe93df13eb45dac8515c5ed0216ef694c33f18' + 'SKIP' + 'b31882ef5e8447e761acee1c4a44c0630cd4d465' + 'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e' + '41d27140fd590945e22e012c9dce62de3d6f11e6' + '72cfecbe738085eec475e012617661ad0cc9b76f' + 'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f') +validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') prepare() { - cd "${srcdir}/freetype-${pkgver}" - patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" - patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-spr.patch" - - # fix segfaults # https://bugs.archlinux.org/task/39365 - # http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=23367ff97f33ef6a2b7e1fced1157c87a46d9596 - patch -Np1 -i "${srcdir}/fix_segfault_with_harfbuzz.diff" - - # Disabled for now due to resistance - # Kept here for easier rebuilds via ABS - # https://bugs.archlinux.org/task/35274 - #patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-sph.patch" + # Rename source dir to allow building the demos + mv freetype-${pkgver} freetype2 + + cd freetype2 + patch -Np1 -i ../0001-Enable-table-validation-modules.patch + patch -Np1 -i ../0002-Enable-subpixel-rendering.patch + patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch + + cd ../ft2demos-${pkgver} + # enable more demos + patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch + + # Suppress RPATH + sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk } build() { - cd "${srcdir}/freetype-${pkgver}" + cd freetype2 ./configure --prefix=/usr --disable-static make + + # Build demos + cd ../ft2demos-${pkgver} + make } check() { - cd "${srcdir}/freetype-${pkgver}" + cd freetype2 make -k check } -package() { - cd "${srcdir}/freetype-${pkgver}" +package_freetype2() { + pkgdesc="TrueType font rendering library" + depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz') + provides=('libfreetype.so') + install=freetype2.install + backup=('etc/profile.d/freetype2.sh') + + cd freetype2 make DESTDIR="${pkgdir}" install + install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh" + + # Package docs + install -dm755 "${pkgdir}/usr/share/doc" + cp -a docs "${pkgdir}/usr/share/doc/${pkgname}" + + cd ../ft2demos-${pkgver} + mkdir -p $srcdir/ft-demos + for _i in bin/{f,t}t*; do + libtool --mode=install install $_i "$srcdir/ft-demos" + done +} + +package_freetype2-demos() { + pkgdesc="Freetype tools and demos" + depends=('freetype2' 'libx11') + + install -dm755 "${pkgdir}/usr/bin" + cp -a $srcdir/ft-demos/* "${pkgdir}/usr/bin" } diff --git a/abs/core/freetype2/fix_segfault_with_harfbuzz.diff b/abs/core/freetype2/fix_segfault_with_harfbuzz.diff deleted file mode 100644 index a1832eb..0000000 --- a/abs/core/freetype2/fix_segfault_with_harfbuzz.diff +++ /dev/null @@ -1,32 +0,0 @@ -From 23367ff97f33ef6a2b7e1fced1157c87a46d9596 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg <wl@gnu.org> -Date: Mon, 17 Mar 2014 06:33:14 +0000 -Subject: Fix Savannah bug #41869. - -This works around a problem with HarfBuzz (<= 0.9.26), which doesn't -validate glyph indices returned by -`hb_ot_layout_lookup_collect_glyphs'. - -* src/autofit/hbshim.c (af_get_coverage): Guard `idx'. - -* docs/CHANGES: Updated. ---- -diff --git a/src/autofit/hbshim.c b/src/autofit/hbshim.c -index 11fb743..2eda8d7 100644 ---- a/src/autofit/hbshim.c -+++ b/src/autofit/hbshim.c -@@ -347,6 +347,11 @@ - count++; - #endif - -+ /* HarfBuzz 0.9.26 and older doesn't validate glyph indices */ -+ /* returned by `hb_ot_layout_lookup_collect_glyphs'... */ -+ if ( idx >= (hb_codepoint_t)globals->glyph_count ) -+ continue; -+ - if ( gstyles[idx] == AF_STYLE_UNASSIGNED ) - gstyles[idx] = (FT_Byte)style_class->style; - #ifdef FT_DEBUG_LEVEL_TRACE --- -cgit v0.9.0.2 - diff --git a/abs/core/freetype2/freetype-2.2.1-enable-valid.patch b/abs/core/freetype2/freetype-2.2.1-enable-valid.patch deleted file mode 100644 index c78b6b7..0000000 --- a/abs/core/freetype2/freetype-2.2.1-enable-valid.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 -+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 -@@ -110,7 +110,7 @@ - AUX_MODULES += cache - - # TrueType GX/AAT table validation. Needs ftgxval.c below. --# AUX_MODULES += gxvalid -+AUX_MODULES += gxvalid - - # Support for streams compressed with gzip (files with suffix .gz). - # -@@ -124,7 +124,7 @@ - - # OpenType table validation. Needs ftotval.c below. - # --# AUX_MODULES += otvalid -+AUX_MODULES += otvalid - - # Auxiliary PostScript driver component to share common code. - # diff --git a/abs/core/freetype2/freetype-2.5.1-enable-sph.patch b/abs/core/freetype2/freetype-2.5.1-enable-sph.patch deleted file mode 100644 index 69f73b7..0000000 --- a/abs/core/freetype2/freetype-2.5.1-enable-sph.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/include/config/ftoption.h w/include/config/ftoption.h -index fe2ba15..1ab4226 100644 ---- i/include/config/ftoption.h -+++ w/include/config/ftoption.h -@@ -591,7 +591,7 @@ FT_BEGIN_HEADER - /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ - /* defined. */ - /* */ --/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */ -+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING - - - /*************************************************************************/ diff --git a/abs/core/freetype2/freetype-2.5.1-enable-spr.patch b/abs/core/freetype2/freetype-2.5.1-enable-spr.patch deleted file mode 100644 index 0d300a8..0000000 --- a/abs/core/freetype2/freetype-2.5.1-enable-spr.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/include/config/ftoption.h w/include/config/ftoption.h -index fe2ba15..22ce1a3 100644 ---- i/include/config/ftoption.h -+++ w/include/config/ftoption.h -@@ -92,7 +92,7 @@ FT_BEGIN_HEADER - /* This is done to allow FreeType clients to run unmodified, forcing */ - /* them to display normal gray-level anti-aliased glyphs. */ - /* */ --/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ -+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - - /*************************************************************************/ diff --git a/abs/core/freetype2/freetype2.install b/abs/core/freetype2/freetype2.install new file mode 100644 index 0000000..5d4d1e7 --- /dev/null +++ b/abs/core/freetype2/freetype2.install @@ -0,0 +1,8 @@ +post_upgrade() { + if (( $(vercmp $2 2.7-1) < 0 )); then + cat <<MSG + The Arch-specific FT2_SUBPIXEL_HINTING has been removed. + Subpixel hinting is now configured in /etc/profile.d/freetype2.sh . +MSG + fi +} diff --git a/abs/core/freetype2/freetype2.sh b/abs/core/freetype2/freetype2.sh new file mode 100644 index 0000000..93165d3 --- /dev/null +++ b/abs/core/freetype2/freetype2.sh @@ -0,0 +1,12 @@ +# Subpixel hinting mode can be chosen by setting the right TrueType interpreter +# version. The available settings are: +# +# truetype:interpreter-version=35 # Classic mode (default in 2.6) +# truetype:interpreter-version=38 # Infinality mode +# truetype:interpreter-version=40 # Minimal mode (default in 2.7) +# +# There are more properties that can be set, separated by whitespace. Please +# refer to the FreeType documentation for details. + +# Uncomment and configure below +#export FREETYPE_PROPERTIES="truetype:interpreter-version=40" diff --git a/abs/core/iproute2/iproute2-fhs.patch b/abs/core/iproute2/0001-make-iproute2-fhs-compliant.patch index f632b64..ef6a077 100644 --- a/abs/core/iproute2/iproute2-fhs.patch +++ b/abs/core/iproute2/0001-make-iproute2-fhs-compliant.patch @@ -1,8 +1,22 @@ +From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Thu, 28 Jul 2016 08:49:20 +0200 +Subject: [PATCH 1/1] make iproute2 fhs compliant + +Signed-off-by: Christian Hesse <mail@eworm.de> +--- + Makefile | 2 +- + netem/Makefile | 4 ++-- + tc/q_netem.c | 2 +- + tc/tc_util.c | 15 +++++++++++++++ + tc/tc_util.h | 1 + + 5 files changed, 20 insertions(+), 4 deletions(-) + diff --git a/Makefile b/Makefile -index 67176be..6549447 100644 +index eb571a5..db0a04c 100644 --- a/Makefile +++ b/Makefile -@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include +@@ -14,7 +14,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include SHARED_LIBS = y @@ -28,7 +42,7 @@ index e52e125..5b4d283 100644 clean: diff --git a/tc/q_netem.c b/tc/q_netem.c -index cd990a0..7d4e71f 100644 +index 8fe2204..a15a5c7 100644 --- a/tc/q_netem.c +++ b/tc/q_netem.c @@ -113,7 +113,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata) @@ -41,7 +55,7 @@ index cd990a0..7d4e71f 100644 fprintf(stderr, "No distribution data for %s (%s: %s)\n", type, name, strerror(errno)); diff --git a/tc/tc_util.c b/tc/tc_util.c -index aa6de24..22bb6d5 100644 +index afc4cf5..728b854 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c @@ -32,6 +32,10 @@ @@ -52,7 +66,7 @@ index aa6de24..22bb6d5 100644 +#define DATADIR "/usr/share" +#endif + - static struct db_names *cls_names = NULL; + static struct db_names *cls_names; #define NAMES_DB "/etc/iproute2/tc_cls" @@ -73,6 +77,17 @@ const char *get_tc_lib(void) @@ -80,8 +94,8 @@ index 61e60b1..6d448de 100644 @@ -55,6 +55,7 @@ struct exec_util { }; - extern const char *get_tc_lib(void); -+extern const char *get_tc_datadir(void); + const char *get_tc_lib(void); ++const char *get_tc_datadir(void); - extern struct qdisc_util *get_qdisc_kind(const char *str); - extern struct filter_util *get_filter_kind(const char *str); + struct qdisc_util *get_qdisc_kind(const char *str); + struct filter_util *get_filter_kind(const char *str); diff --git a/abs/core/iproute2/PKGBUILD b/abs/core/iproute2/PKGBUILD index 4a6bcc0..566c75b 100644 --- a/abs/core/iproute2/PKGBUILD +++ b/abs/core/iproute2/PKGBUILD @@ -1,41 +1,32 @@ # $Id$ +# Maintainer: Christian Hesse <mail@eworm.de> # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> -pkgname=iproute2 -pkgver=4.1.1 +pkgbase=iproute2 +#pkgname=(iproute2 iproute2-doc) +pkgname=(iproute2) +pkgver=4.9.0 pkgrel=1 -pkgdesc="IP Routing Utilities" +pkgdesc='IP Routing Utilities' arch=('i686' 'x86_64') license=('GPL2') -url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" -depends=('glibc' 'iptables') -makedepends=('linux-atm') -optdepends=('linux-atm: ATM support') -groups=('base') -provides=('iproute') -conflicts=('iproute') -replaces=('iproute') +url='http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2' +#makedepends=('iptables' 'linux-atm' 'linuxdoc-tools' 'texlive-bin' 'texlive-core' 'texlive-latexextra') +makedepends=('iptables' 'linux-atm') options=('staticlibs' '!makeflags') -backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ - 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger -source=("http://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign} - iproute2-fhs.patch - unwanted-link-help.patch) -sha1sums=('750c17e720b43041c23fed7b8cf0118c0e841036' - 'SKIP' - '2dc6d8f1a2495a0d51eaa303dcc78ecc0c477935' - '3b1335f4025f657f388fbf4e5a740871e3129c2a') +source=("https://www.kernel.org/pub/linux/utils/net/${pkgbase}/${pkgbase}-${pkgver}.tar."{xz,sign} + '0001-make-iproute2-fhs-compliant.patch') +sha256sums=('c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4' + 'SKIP' + 'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgbase}-${pkgver}" # set correct fhs structure - patch -Np1 -i "${srcdir}/iproute2-fhs.patch" - - # allow operations on links called "h", "he", "hel", "help" - patch -Np1 -i "${srcdir}/unwanted-link-help.patch" + patch -Np1 -i "${srcdir}/0001-make-iproute2-fhs-compliant.patch" # do not treat warnings as errors sed -i 's/-Werror//' Makefile @@ -43,23 +34,51 @@ prepare() { } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgbase}-${pkgver}" ./configure make + +# cd "${srcdir}/${pkgbase}-${pkgver}/doc/" + +# make html pdf } -package() { - cd "${srcdir}/${pkgname}-${pkgver}" +package_iproute2() { + depends=('glibc' 'iptables') + optdepends=('linux-atm: ATM support') + groups=('base') + provides=('iproute') + conflicts=('iproute') + replaces=('iproute') + backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ + 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') - make DESTDIR="${pkgdir}" install + cd "${srcdir}/${pkgbase}-${pkgver}" + + make DESTDIR="${pkgdir}" SBINDIR="/usr/bin" install + + # remove documentation + rm -rf "${pkgdir}/usr/share/doc/" # libnetlink isn't installed, install it FS#19385 - install -Dm644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h" - install -Dm644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a" + install -Dm0644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h" + install -Dm0644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a" +} + +package_iproute2-doc() { + pkgdesc='IP Routing Utilities documentation' + + cd "${srcdir}/${pkgbase}-${pkgver}" - # move binaries - cd "${pkgdir}" - mv sbin usr/bin + make DESTDIR="${pkgdir}" install + + # documentation is included in default install target... So clean up here. + find "${pkgdir}/" ! -type d ! -regex '.*examples.*' -delete + find "${pkgdir}/" -empty -delete + find "${pkgdir}/" -name '*.sgml' -delete + find "${pkgdir}/" -name '*.tex' -delete + install -m0644 doc/*.html doc/*.pdf "${pkgdir}/usr/share/doc/iproute2/" } + diff --git a/abs/core/iproute2/__changelog b/abs/core/iproute2/__changelog new file mode 100644 index 0000000..fd3fc81 --- /dev/null +++ b/abs/core/iproute2/__changelog @@ -0,0 +1 @@ +PKGBUILD: disable iproute2-doc and tex doc deps diff --git a/abs/core/iproute2/unwanted-link-help.patch b/abs/core/iproute2/unwanted-link-help.patch deleted file mode 100644 index 8abe9e3..0000000 --- a/abs/core/iproute2/unwanted-link-help.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ru iproute2-3.10.0.orig/ip/iplink.c iproute2-3.10.0/ip/iplink.c ---- iproute2-3.10.0.orig/ip/iplink.c 2013-08-08 13:53:33.000000000 -0700 -+++ iproute2-3.10.0/ip/iplink.c 2013-08-08 13:55:03.179865309 -0700 -@@ -467,11 +467,11 @@ - addattr_l(&req->n, sizeof(*req), IFLA_NUM_RX_QUEUES, - &numrxqueues, 4); - } else { -+ if (matches(*argv, "help") == 0) -+ usage(); - if (strcmp(*argv, "dev") == 0) { - NEXT_ARG(); - } -- if (matches(*argv, "help") == 0) -- usage(); - if (*dev) - duparg2("dev", *argv); - *dev = *argv; diff --git a/abs/core/libass/PKGBUILD b/abs/core/libass/PKGBUILD index 9ac426b..9c38fe4 100644 --- a/abs/core/libass/PKGBUILD +++ b/abs/core/libass/PKGBUILD @@ -4,20 +4,20 @@ # Contributor: G_Syme <demichan@mail.upb.de> pkgname=libass -pkgver=0.13.2 +pkgver=0.13.4 pkgrel=1 -pkgdesc="A portable library for SSA/ASS subtitles rendering" +pkgdesc='A portable library for SSA/ASS subtitles rendering' arch=('i686' 'x86_64') -url="https://github.com/libass/libass/" +url='https://github.com/libass/libass/' license=('BSD') depends=('fribidi' 'fontconfig') makedepends=('pkg-config' 'yasm') provides=('libass.so') -source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('1c8cbd5751aeb192bda04a65d0464fd9') +source=("https://github.com/libass/libass/releases/download/${pkgver}/libass-${pkgver}.tar.xz") +sha256sums=('d84a2fc89011b99d87fc47af91906622707c165d1860e9f774825ebbbc9c9fb6') build() { - cd ${pkgname}-${pkgver} + cd libass-${pkgver} ./configure \ --prefix='/usr' \ @@ -27,10 +27,10 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd libass-${pkgver} make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm 644 COPYING -t "${pkgdir}"/usr/share/licenses/libass/ } # vim: ts=2 sw=2 et: diff --git a/abs/core/libdvdnav/PKGBUILD b/abs/core/libdvdnav/PKGBUILD index 334c63d..4bd01d5 100644 --- a/abs/core/libdvdnav/PKGBUILD +++ b/abs/core/libdvdnav/PKGBUILD @@ -4,7 +4,7 @@ # contributor Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libdvdnav -pkgver=5.0.1 +pkgver=5.0.3 pkgrel=1 pkgdesc="The library for xine-dvdnav plugin." arch=('i686' 'x86_64') @@ -12,11 +12,14 @@ license=('GPL') url="http://dvdnav.mplayerhq.hu/" depends=('libdvdread') makedepends=('git') -source=(git://git.videolan.org/libdvdnav.git#tag=$pkgver) -sha256sums=('SKIP') +source=(git+https://code.videolan.org/videolan/libdvdnav.git#tag=$pkgver + fix-crash-describe_title.patch) +sha256sums=('SKIP' + '6a8e9c777dd9dbfa8a7f981796bd7a60412e3a5c7a8400253c567d956412c64b') prepare() { cd $pkgname + patch -Np1 -i ../fix-crash-describe_title.patch autoreconf -fi } diff --git a/abs/core/libdvdnav/fix-crash-describe_title.patch b/abs/core/libdvdnav/fix-crash-describe_title.patch new file mode 100644 index 0000000..1c07336 --- /dev/null +++ b/abs/core/libdvdnav/fix-crash-describe_title.patch @@ -0,0 +1,29 @@ +From 8a270d6dd40ac43c98c948fe9d10e5bcb4aa3d41 Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf <jb@videolan.org> +Date: Tue, 1 Sep 2015 16:00:59 +0200 +Subject: [PATCH] Fix crashes with some DVDs on describe_title + +This is a stop-over, but the actual issue is not fixed +--- + src/searching.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/searching.c b/src/searching.c +index 70c0f85..f638b61 100644 +--- a/src/searching.c ++++ b/src/searching.c +@@ -644,6 +644,11 @@ uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t + if(!tmp) + goto fail; + ++ if(!ptt) { ++ printerr("ptt NULL"); ++ goto fail; ++ } ++ + length = 0; + for(i=0; i<parts; i++) { + uint32_t cellnr, endcellnr; +-- +1.7.10.4 + diff --git a/abs/core/libdvdread/PKGBUILD b/abs/core/libdvdread/PKGBUILD index b7fdba4..04e4431 100644 --- a/abs/core/libdvdread/PKGBUILD +++ b/abs/core/libdvdread/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libdvdread -pkgver=5.0.0 +pkgver=5.0.4 pkgrel=1 pkgdesc="Provides a simple foundation for reading DVD video disks" arch=(i686 x86_64) @@ -13,7 +13,8 @@ license=('GPL') depends=('glibc') makedepends=('libdvdcss' 'git') optdepends=('libdvdcss: for decoding encrypted DVDs') -source=(git://git.videolan.org/libdvdread.git#tag=$pkgver) +_gitver=5ec409508803037dfa931591aef93851458d1d2a +source=(git+https://code.videolan.org/videolan/libdvdread.git#commit=$_gitver) sha256sums=('SKIP') prepare() { diff --git a/abs/core/libogg/PKGBUILD b/abs/core/libogg/PKGBUILD index 35bfbff..b3a3198 100644 --- a/abs/core/libogg/PKGBUILD +++ b/abs/core/libogg/PKGBUILD @@ -1,24 +1,21 @@ -# $Id: PKGBUILD 134991 2011-08-09 20:12:08Z eric $ -# Maintainer: +# $Id$ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: John Proctor <jproctor@prium.net> pkgname=libogg -pkgver=1.3.0 +pkgver=1.3.2 pkgrel=1 pkgdesc="Ogg bitstream and framing library" arch=('i686' 'x86_64') url="http://www.xiph.org/ogg/" license=('BSD') depends=('glibc') -options=('!libtool') source=(http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.xz config_types.h) -md5sums=('84a35715170f2cd4c77a4448772b95d5' - 'a4d786b1b1955cb85b64fd16cbbee3f9') build() { cd "$srcdir/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr make } @@ -36,3 +33,5 @@ package() { "${pkgdir}/usr/include/ogg/config_types.h" fi } +md5sums=('5c3a34309d8b98640827e5d0991a4015' + 'a4d786b1b1955cb85b64fd16cbbee3f9') diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index 5bbe836..713c753 100755 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-theme pkgver=8.4 -pkgrel=20 +pkgrel=21 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') license=('GPL2') @@ -108,7 +108,7 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60' '8312aff444945f80a76100696c81cb2e' '5527190d8dd74e720b9160f851727390' '5a8fb2a5f0e657d52be6f0a6a006ce72' - '35d77d91125e46728a30ab23d0903223' + '36952501471b05395e4f061557447b2f' 'bfc32b9fa5dca3d46dd6f365ecb449b5' '326a71eb795b322a9ea26f116d890c87' '8fcd0acc11f4db33a9442949fb1a293d' diff --git a/abs/core/linhes-theme/install-ui.xml b/abs/core/linhes-theme/install-ui.xml index b3f1884..4e5f139 100644 --- a/abs/core/linhes-theme/install-ui.xml +++ b/abs/core/linhes-theme/install-ui.xml @@ -30,7 +30,7 @@ <textarea name="date_text" from="basetextarea"> <multiline>yes</multiline> <font>baselarge</font> - <area>20,30,1240,80</area> + <area>210,30,860,80</area> <value></value> <align>allcenter</align> </textarea> @@ -38,7 +38,7 @@ <!--not used by mythinstall--> <textarea name="status_text" from="basetextarea"> <multiline>yes</multiline> - <font>basemediumyellow</font> + <font>basemedium</font> <area>20,140,1240,60</area> <value></value> </textarea> @@ -50,11 +50,31 @@ <value></value> </textarea> + <shape name="recording_text_box" from="base_backdrop"> + <area>200,120,880,160</area> + </shape> + <shape name="recording_text_box_backdrop_line" from="base_backdrop_line"> + <area>200,120,880,160</area> + </shape> + <shape name="recording_text_box_backdrop_top_line" from="base_highlight_line"> + <area>202,121,878,2</area> + </shape> + <shape name="recording_text_box_backdrop_bottom_line" from="base_highlight_line"> + <area>202,277,878,2</area> + </shape> + <shape name="recording_text_box_backdrop_left_line" from="base_highlight_vertical_line"> + <area>202,123,2,160</area> + </shape> + <shape name="recording_text_box_backdrop_right_line" from="base_highlight_vertical_line"> + <area>1077,123,2,160</area> + </shape> + + <!--mythinstall uses recording_text for percentage done--> <textarea name="recording_text" from="basetextarea"> <multiline>yes</multiline> <font>basemedium</font> - <area>20,170,1240,60</area> - <value>Press MENU for options</value> + <area>210,130,860,30</area> + <value>Press MENU for Options</value> <align>center</align> </textarea> @@ -65,20 +85,22 @@ <value></value> </textarea> + <!--mythinstall uses scheduled_text for status--> <textarea name="scheduled_text"> <font>basemedium</font> - <area>20,230,1240,30</area> + <area>210,185,860,30</area> <value></value> <align>center</align> </textarea> - <textarea name="mythvantage_text"> - <multiline>no</multiline> + <!--mythinstall uses mythvantage_text for logs--> + <textarea name="mythvantage_text" from="basetextarea"> + <multiline>yes</multiline> <font>basesmall</font> - <area>20,663,1240,20</area> - <value></value> + <area>210,220,860,60</area> <align>center</align> <cutdown>yes</cutdown> + <value></value> </textarea> <imagetype name="LHLogo"> diff --git a/abs/core/mysql/PKGBUILD b/abs/core/mysql/PKGBUILD index 2c3fdcf..0c3a45f 100644 --- a/abs/core/mysql/PKGBUILD +++ b/abs/core/mysql/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('mysql' 'libmysqlclient' 'mysql-clients') pkgbase=mysql -pkgver=5.6.33 +pkgver=5.6.35 pkgrel=1 pkgdesc="Fast SQL database server, community edition" arch=('i686' 'x86_64') @@ -130,7 +130,7 @@ package_mysql(){ make DESTDIR="${pkgdir}" install install -m 644 -D "${srcdir}/my.cnf" "${pkgdir}/etc/mysql/my.cnf" - install -m 755 -D "${srcdir}"/mysqld.rc "${pkgdir}"/etc/rc.d/mysqld + install -m 755 -D "${srcdir}/mysqld.rc" "${pkgdir}/etc/rc.d/mysqld" install -m 755 -D "${srcdir}/mysqld-post.sh" "${pkgdir}/usr/bin/mysqld-post" install -m 644 -D "${srcdir}/mysqld-tmpfile.conf" "${pkgdir}/usr/lib/tmpfiles.d/mysqld.conf" install -m 755 -d "${pkgdir}/usr/lib/systemd/system" @@ -169,7 +169,7 @@ package_mysql(){ rm "${pkgdir}/usr/share/man/man1/mysql-test-run.pl.1" } -md5sums=('7fbf37928ef651e005b80e820a055385' +md5sums=('e4f170f6f73aa94c0d8da90019545908' 'b79e65a5aa536e6b5bc60988eb0b78a2' '2fa6e456964d4ff5e6d4f9ff0126aed6' '81b62df0f569935109c1b107dfe9f9fa' diff --git a/abs/core/mythdb-initial/PKGBUILD b/abs/core/mythdb-initial/PKGBUILD index 9906561..e7052f4 100755 --- a/abs/core/mythdb-initial/PKGBUILD +++ b/abs/core/mythdb-initial/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythdb-initial pkgver=8.4 -pkgrel=4 +pkgrel=5 pkgdesc="setup the initial mythtv database for linhes" url="" license=() @@ -22,4 +22,4 @@ package() { md5sums=('5f3492d396142d394c095749363fd03d' 'ad0e57ac5e7c3677808a670e16634bba' - '6d103c9e73ac2eb47cea2b53a7308068') + '1701d4b347aebe6cee63408c90cd7a74') diff --git a/abs/core/mythdb-initial/custom.sql b/abs/core/mythdb-initial/custom.sql index 05d814d..7c97589 100644 --- a/abs/core/mythdb-initial/custom.sql +++ b/abs/core/mythdb-initial/custom.sql @@ -167,10 +167,10 @@ INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES -- Defaults for OS install INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES -('HOSTuprootfstype','ext3' , 'apheleia'), +('HOSTuprootfstype','ext4' , 'apheleia'), ('HOSTOSsize', '5' , 'apheleia'), -('HOSTrootfstype', 'ext3' , 'apheleia'), -('HOSTHOMEsize', '3' , 'apheleia'), +('HOSTrootfstype', 'ext4' , 'apheleia'), +('HOSTHOMEsize', '5' , 'apheleia'), ('HOSTDatabasesize','2' , 'apheleia'), ('HostUseSWAP', '1' , 'apheleia'), ('HostUseALLdata', '1' , 'apheleia'), diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installationtype.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installationtype.cpp index 96866dc..cb2e918 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installationtype.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installationtype.cpp @@ -1,23 +1,106 @@ +//#include <QObject> #include <mythcontext.h> #include <unistd.h> -#include "installationtype.h" #include <QTextStream> - #include <qdir.h> + #include "mv_common.h" +#include "mythprogressdialog.h" +#include "installationtype.h" +#include "mythsystemlegacy.h" int mythinstalltype (QString tmp_install_drive) { - - Mythinstalltype setting; - //FINDME this is needed to populate the default values and have the triggered config work - setting.Load(); - setting.Save(); - - int retc = 1 ; - if ( setting.exec() == QDialog::Accepted ) + QString line; + QString disksize; + QString rootsize; + QString homesize; + QString sqlsize; + QString useswap; + QString swapsize; + QString datasize; + QString usealldata; + int neededsize; + int disksizeMB; + + int retc = 1; + while ( retc != 0 ) { - retc = 0; + Mythinstalltype setting; + //FINDME this is needed to populate the default values and have the triggered config work + setting.Load(); + setting.Save(); + + if ( setting.exec() == QDialog::Accepted ) + { + //get users sizes + rootsize = gCoreContext->GetSetting("HOSTOSsize"); + homesize = gCoreContext->GetSetting("HOSTHOMEsize"); + sqlsize = gCoreContext->GetSetting("HOSTDatabasesize"); + useswap = gCoreContext->GetSetting("HostUseSWAP"); + swapsize = gCoreContext->GetSetting("HOSTSWAPsize"); + usealldata = gCoreContext->GetSetting("HostUseALLdata"); + datasize = gCoreContext->GetSetting("HOSTDATAsize"); + //check if using swap + if ( useswap == "0" ) + swapsize = "0"; + //calculate size of all partitions; + neededsize = rootsize.toInt() * 1024 + homesize.toInt() *1024 + + sqlsize.toInt() * 1024 + swapsize.toInt(); + //add 300 MB to neededsize if usealldata is enabled + if ( usealldata == "1" ) + neededsize = neededsize + 300; + else + neededsize = neededsize + datasize.toInt() * 1024; + //get selected drive size + //using myth_system as QFile wouldn't read /proc/partitions directly + myth_system("cat /proc/partitions > /tmp/proc.partitions"); + QFile file("/tmp/proc.partitions"); + if (file.open(QIODevice::ReadOnly | QIODevice::Text)) + { + QTextStream t( &file ); + while (!t.atEnd()) + { + line = t.readLine(); + line = line.simplified(); + if ( line.endsWith(tmp_install_drive) ) + { + disksize = line.section( " ", 2, 2 ); + //QTextStream(stdout) << "disksize:" + disksize << endl; + break; + } + } + } + file.close(); + //convert to MB and match calulation in installdialog.cpp + disksizeMB = qRound(disksize.toFloat() * 1024 / 1000000); + + if (neededsize > disksizeMB) + { + DialogCode val = MythPopupBox::Show2ButtonPopup( + GetMythMainWindow(), + "Error", "The total partition sizes (" + QString::number(neededsize) + " MB) are too large for the selected drive (" + QString::number(disksizeMB) + " MB). Continuing may result in a failed install.", + QObject::tr("Continue"), + QObject::tr("Try Again"), + kDialogCodeButton1); + if ( val == kDialogCodeButton0 ) + { + retc = 0; + } + else + { + retc = 1; + } + } + else + { + retc = 0; + } + } + else + { + retc = 0; + } } return retc; @@ -94,7 +177,7 @@ static HostSpinBox *HOSTSWAPsize() { QTextStream t( &file ); // use a text stream line = t.readLine(); - if ( line.startsWith("MemTotal:")) + if ( line.startsWith("MemTotal:") ) { currentitem = line.simplified(); currentitem = currentitem.section( " ", 1, 1 ); @@ -104,7 +187,7 @@ static HostSpinBox *HOSTSWAPsize() bool ok; int mem = currentitem.toInt( &ok, 10 ); // dec == 0, ok == FALSE //QTextStream(stdout) << mem << endl; - mem = mem/1024 ; + mem = mem / 1024 + 16; //QTextStream(stdout) << mem << endl; if ( ! ok ) diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp index 1724da7..6f4252f 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp @@ -230,7 +230,7 @@ void WelcomeDialog::updateScreen(void) cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh " ); system(qPrintable(cmdtxt)); - recording_text=" "; + recording_text="Press MENU for Options"; mythvantage_text=" "; error_text=" "; scheduled_text=" "; @@ -293,6 +293,7 @@ void WelcomeDialog::updateScreen(void) // shows the busy box when configuring the system if ( scheduled_text == "Configuring system") { + m_recording_text->SetText(" "); if ( ! I_AM_BUSY ) busy_box(); } @@ -300,9 +301,9 @@ void WelcomeDialog::updateScreen(void) void WelcomeDialog::busy_box(void) { - QString msgtext = "Please wait, " ; + QString msgtext = "Please wait, configuring LinHES on host " ; msgtext.append(current_hostname); - msgtext.append(" is preparing for life"); + msgtext.append("..."); MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack"); MythUIBusyDialog *busyPopup = new MythUIBusyDialog(msgtext, popupStack,"installbusy"); if (busyPopup->Create()) @@ -316,7 +317,7 @@ void WelcomeDialog::busy_box(void) } - while ( scheduled_text == "Configuring system" ) + while ( scheduled_text == "Configuring system" ) { qApp->processEvents (); usleep(900); @@ -334,7 +335,7 @@ void WelcomeDialog::busy_box(void) void WelcomeDialog::busy_find_oldsettings(void) { - QString msgtext = "Importing old settings" ; + QString msgtext = "Importing Old Settings..." ; MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack"); MythUIBusyDialog *busyPopup = new MythUIBusyDialog(msgtext, popupStack, "importsettingsbusy"); @@ -423,13 +424,13 @@ void WelcomeDialog::showPopup(void) SLOT(runLIVECD())); m_menuPopup->AddButton(tr("Exit"), SLOT(closeDialog())); - m_menuPopup->AddButton(tr("Close menu")) ; + m_menuPopup->AddButton(tr("Close Menu")) ; } else { m_menuPopup->AddButton(tr("Exit"), SLOT(closeDialog())); - m_menuPopup->AddButton(tr("Close menu")); + m_menuPopup->AddButton(tr("Close Menu")); } } @@ -545,7 +546,7 @@ void WelcomeDialog::showPopup_2(void) { MythScreenStack *popupStack = GetMythMainWindow()->GetMainStack(); - m_menuPopup = new MythDialogBox("Select the drive to install to", popupStack, "actionmenu"); + m_menuPopup = new MythDialogBox("Where do you want to install LinHES?", popupStack, "actionmenu"); if (m_menuPopup->Create()) popupStack->AddScreen(m_menuPopup); @@ -561,7 +562,7 @@ void WelcomeDialog::showPopup_2(void) QString NETBOOT = getenv("NETBOOT"); NETBOOT=NETBOOT.simplified(); if ( NETBOOT == "YES" ) - m_menuPopup->AddButton(("Diskless Frontend " ), SLOT(install_net() ) ); + m_menuPopup->AddButton(("Diskless Frontend"), SLOT(install_net() ) ); QString INSTALLSOURCE = findinstallsouce(); ifstream partitions("/proc/partitions"); @@ -615,7 +616,7 @@ void WelcomeDialog::showPopup_2(void) void WelcomeDialog::GO_popup(QString go_text) { DialogCode retval = MythPopupBox::Show2ButtonPopup(GetMythMainWindow(), - "", go_text, tr("Start the process"), + "", go_text, tr("Start Installation"), tr("Cancel"), kDialogCodeButton0); if ( retval == kDialogCodeButton0 ) @@ -644,11 +645,12 @@ void WelcomeDialog::Reboot_popup(void) prompt1.append("\n"); } else - prompt1 = QObject::tr("Ready to go!"); + prompt1 = QObject::tr("Installation of LinHES is complete!"); + prompt1.append("\n"); reboot_box = new DialogBox(GetMythMainWindow(), prompt1); reboot_box->AddButton(QObject::tr("Reboot")); - reboot_box->AddButton(QObject::tr("Power off")); + reboot_box->AddButton(QObject::tr("Power Off")); int returncode = 0; DialogCode dcode = reboot_box->exec(); @@ -832,9 +834,9 @@ void WelcomeDialog::install_generic(void) installwarningtext="Warning!"; installwarningtext.append ("\n"); installwarningtext.append ("\n"); - installwarningtext.append ("Installation drive ("); + installwarningtext.append ("The selected drive ("); installwarningtext.append (install_drive); - installwarningtext.append (") is about to be erased."); + installwarningtext.append (") will be erased and LinHES will be installed."); installwarningtext.append ("\n"); } else if ( installtype == "NET") @@ -856,8 +858,11 @@ void WelcomeDialog::install_generic(void) installwarningtext.append ("OS partition ("); installwarningtext.append (install_drive); installwarningtext.append ("1"); - installwarningtext.append (") will be erased."); + installwarningtext.append (") will be erased and LinHES will be installed."); installwarningtext.append ("\n"); + installwarningtext.append ("The other partitions on ("); + installwarningtext.append (install_drive); + installwarningtext.append (") will not be erased."); QString cmdtxt; cmdtxt=MV_ROOT ; @@ -947,7 +952,7 @@ void WelcomeDialog::install_generic(void) void busy_network(void) { - QString msgtext = "Starting network" ; + QString msgtext = "Starting Network" ; MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack"); MythUIBusyDialog *busyPopup = new MythUIBusyDialog(msgtext, popupStack,"installbusy"); if (busyPopup->Create()) @@ -991,7 +996,7 @@ int WelcomeDialog::ask_validate_network(void) else { MythProgressDialog *network_check = NULL; - network_check = new MythProgressDialog(QObject::tr("Please wait while the network is checked."), 7); + network_check = new MythProgressDialog(QObject::tr("Please wait while the network is checked..."), 7); QString cmdtxt; cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh network_check_it setup_network &"); @@ -1006,7 +1011,7 @@ int WelcomeDialog::ask_validate_network(void) if ( retval != 0 ) { network_check->Close(); - pop_text="Could not find myself on the network"; + pop_text="Could not find myself on the network."; } } @@ -1019,7 +1024,7 @@ int WelcomeDialog::ask_validate_network(void) if ( retval != 0 ) { network_check->Close(); - pop_text="Could not locate gateway"; + pop_text="Could not locate the gateway server."; } } @@ -1032,7 +1037,7 @@ int WelcomeDialog::ask_validate_network(void) if ( retval != 0 ) { network_check->Close(); - pop_text="Could not locate nameserver"; + pop_text="Could not locate nameserver."; } } @@ -1045,7 +1050,7 @@ int WelcomeDialog::ask_validate_network(void) if ( retval != 0 ) { network_check->Close(); - pop_text="Could not lookup names"; + pop_text="Could not lookup names."; } } @@ -1058,7 +1063,7 @@ int WelcomeDialog::ask_validate_network(void) if ( retval != 0 ) { network_check->Close(); - pop_text="Hostname already on the network"; + pop_text="This hostname is already on the network."; } } @@ -1075,7 +1080,7 @@ int WelcomeDialog::ask_validate_network(void) GetMythMainWindow(), "", pop_text, tr("Continue"), - tr("Try again"), + tr("Try Again"), kDialogCodeButton0); if (kDialogCodeButton0 == val ) retval = 0; diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD index 4c5b223..93a8f00 100644 --- a/abs/core/mythinstall/PKGBUILD +++ b/abs/core/mythinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jams pkgname=mythinstall -pkgver=8.4 -pkgrel=5 +pkgver=8.4.3 +pkgrel=2 pkgdesc="LinHES installer/systemconfig GUI." arch=('i686' 'x86_64') depends=('mythtv>=0.28') diff --git a/abs/core/mythtv/stable-0.28/git_src/git_hash b/abs/core/mythtv/stable-0.28/git_src/git_hash index 7a99331..d5f2f62 100644 --- a/abs/core/mythtv/stable-0.28/git_src/git_hash +++ b/abs/core/mythtv/stable-0.28/git_src/git_hash @@ -1 +1 @@ -5a7b3c8d418f52b02f971469e230fb016f1f0e16 +299dbaee22795d09503f028670f8bbc891c42c5b diff --git a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD index e2baa8b..f6d8e73 100644 --- a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD @@ -8,8 +8,8 @@ pkgname=('mytharchive' 'mythnews' 'mythweather' 'mythzoneminder') -pkgver=0.28 -pkgrel=31 +pkgver=0.28.1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') @@ -50,7 +50,8 @@ build() { package_mytharchive() { pkgdesc="Create DVDs or archive recorded shows in MythTV" depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' "mythtv>=${pkgver}" - 'mjpegtools' 'python2-pillow') + 'm2vrequantiser' 'mjpegtools' 'python2-pillow') + optdepends=('projectx: for subtitle support') cd "${srcdir}/${_gitname}/${pkgbase}/mytharchive" patch mythburn/scripts/mythburn.py < $srcdir/mythburn.py-aspectratio.patch || return 1 patch theme/menus/archivemenu.xml < $srcdir/archivemenu.xml.patch || return 1 diff --git a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD index 0b04f72..77ce196 100644 --- a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv -pkgver=0.28 -pkgrel=31 +pkgver=0.28.1 +pkgrel=2 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -29,7 +29,6 @@ patches=( 'disable_mythnotification_tuner_failure.patch' 'disable_subtitle_cutdown_in_recording_options.patch' 'tv.cpp_fix_caps.patch' - 'add_categorytype_Program.pm.patch' 'searchMetatdataSelectedGrabber.patch' 'addDamagedToProgDetails.patch' 'defaultThemeLinHES.patch' @@ -116,7 +115,6 @@ md5sums=('e30b482dcd5f3e71c6419fd753bab2b1' '1cd668136deea20efb79cf3e6310effc' '3420d15014274b5bf8083355af71304b' '62c42b1043ebf65959fa9eced9ca3ed8' - 'fa836371ebeb3be5b9855be8dd016f82' '0f674b9cad031ba1e03aaf6b5ee1499f' '6add9c16bbb988067e82029327e567b2' '6f916ebc2b1d0ca75c9aa6cec62c6fbb' diff --git a/abs/core/mythtv/stable-0.28/mythtv/add_categorytype_Program.pm.patch b/abs/core/mythtv/stable-0.28/mythtv/add_categorytype_Program.pm.patch deleted file mode 100644 index d84420d..0000000 --- a/abs/core/mythtv/stable-0.28/mythtv/add_categorytype_Program.pm.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/mythtv/bindings/perl/MythTV/Program.pm.orig 2016-04-28 20:31:49.230576243 +0000 -+++ src/mythtv/bindings/perl/MythTV/Program.pm 2016-04-28 20:28:29.779523866 +0000 -@@ -346,6 +346,7 @@ - ($fields{'S'} = ($self->{'subtitle'} or '')) =~ s/%/%%/g; - ($fields{'R'} = ($self->{'description'} or '')) =~ s/%/%%/g; - ($fields{'C'} = ($self->{'category'} or '')) =~ s/%/%%/g; -+ ($fields{'Ct'} = ($self->{'categorytype'} or '')) =~ s/%/%%/g; - ($fields{'U'} = ($self->{'recgroup'} or '')) =~ s/%/%%/g; - # Misc - ($fields{'hn'} = ($self->{'hostname'} or '')) =~ s/%/%%/g; ---- src/mythtv/contrib/user_jobs/mythlink.pl.orig -+++ src/mythtv/contrib/user_jobs/mythlink.pl -@@ -114,6 +114,7 @@ options: - \%ep = Episode (leading zero) - \%in = Internet reference number - \%C = Category -+ \%Ct = Category Type - \%U = RecGroup - \%hn = Hostname of the machine where the file resides - \%c = Channel: MythTV chanid diff --git a/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD index 62fbf57..4ea78e6 100644 --- a/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD +++ b/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb -pkgver=0.28 -pkgrel=9 +pkgver=0.28.1 +pkgrel=1 commit_hash=`cat ../git_src/git_hash_web` pkgdesc="Web interface for MythTV's backend, $commit_hash" arch=('i686' 'x86_64') diff --git a/abs/core/perl_modules/perl-time-format/PKGBUILD b/abs/core/perl_modules/perl-time-format/PKGBUILD new file mode 100644 index 0000000..5d240f7 --- /dev/null +++ b/abs/core/perl_modules/perl-time-format/PKGBUILD @@ -0,0 +1,27 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# This PKGBUILD was autocreated. See http://xtermin.us/archperl/ for details +# Maintainer: Charles Mauch <cmauch@gmail.com> + +pkgname=perl-time-format +pkgver=1.12 +pkgrel=2 +pkgdesc="Perl/CPAN Module Time::Format : Easytouse datetime formatting" +arch=(any) +url="http://search.cpan.org/dist/Time-Format" +license=("GPL" "PerlArtistic") +source=("http://search.cpan.org/CPAN/authors/id/R/RO/ROODE/Time-Format-$pkgver.tar.gz") +md5sums=('cd42110c749bea1b4babcd5fa9d0fdad') + +build() { + cd "$srcdir"/Time-Format-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd "$srcdir"/Time-Format-$pkgver + make install DESTDIR="$pkgdir" + find "$pkgdir" -name '.packlist' -delete + find "$pkgdir" -name '*.pod' -delete +} diff --git a/abs/core/php/PKGBUILD b/abs/core/php/PKGBUILD index fc39bef..e73312c 100644 --- a/abs/core/php/PKGBUILD +++ b/abs/core/php/PKGBUILD @@ -23,7 +23,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.6.26 +pkgver=5.6.30 pkgrel=1 arch=('i686' 'x86_64') license=('PHP') @@ -393,9 +393,9 @@ package_php-xsl() { install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so } -md5sums=('c51e9115263b4d63ef8f68935cefd7d4' +md5sums=('68753955a8964ae49064c6424f81eb3e' 'SKIP' - 'd425c0a09f7b46814e2695471b38c529' + '8da5e525fcbea84adf54ba2da15e25f0' '4ecf586ef1597aa5eb977573954b5d21' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '16b5e2e4da59f15bea4c2db78a7bc8dc' diff --git a/abs/core/php/php.ini.patch b/abs/core/php/php.ini.patch index 4ce7364..9a904f9 100644 --- a/abs/core/php/php.ini.patch +++ b/abs/core/php/php.ini.patch @@ -82,7 +82,7 @@ +;extension=exif.so +;extension=ftp.so +;extension=gd.so -+extension=gettext.so ++;extension=gettext.so +;extension=gmp.so +;extension=iconv.so +;extension=imap.so diff --git a/abs/core/rsyslog/PKGBUILD b/abs/core/rsyslog/PKGBUILD index 641af25..1e6ef5d 100644 --- a/abs/core/rsyslog/PKGBUILD +++ b/abs/core/rsyslog/PKGBUILD @@ -2,13 +2,13 @@ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=8.11.0 +pkgver=8.24.0 pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') license=('GPL3') -depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd' 'liblogging' 'librelp') +depends=('zlib' 'libestr' 'libee' 'json-c' 'libsystemd' 'liblogging' 'librelp' 'libfastjson') makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls' 'python2-docutils') optdepends=('postgresql-libs: PostgreSQL Database Support' @@ -20,19 +20,17 @@ options=('strip' 'zipman') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog.conf.linhes' 'mythtv.conf' - 'log_care.sh' - 'gnutls.patch') + 'log_care.sh') prepare() { - cd ${srcdir}/${pkgname}-${pkgver} -# patch -p1 <$srcdir/gnutls.patch + cd "$srcdir"/${pkgname}-${pkgver} sed -i rsyslog.service.in \ -e 's|rsyslogd -n|rsyslogd -n -i /run/rsyslogd.pid|' \ -e '/ExecStart=.*$/iPIDFile=/run/rsyslogd.pid' } build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir"/${pkgname}-${pkgver} ./configure --prefix=/usr \ --sbindir=/usr/bin \ --enable-mysql \ @@ -46,19 +44,20 @@ build() { --enable-omjournal \ --enable-relp \ --enable-impstats \ + --enable-imptcp \ + --enable-omprog \ --with-systemdsystemunitdir=/usr/lib/systemd/system make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make install DESTDIR=${pkgdir} - install -D -m644 $srcdir/${pkgname}.conf.linhes ${pkgdir}/etc/${pkgname}.conf - install -D -m644 $srcdir/mythtv.conf ${pkgdir}/etc/rsyslog.d/mythtv.conf - install -D -m755 $srcdir/log_care.sh ${pkgdir}/etc/cron.daily/log_care + cd "$srcdir"/${pkgname}-${pkgver} + make install DESTDIR="$pkgdir" + install -D -m644 "$srcdir"/${pkgname}.conf.linhes "$pkgdir"/etc/${pkgname}.conf + install -D -m644 "$srcdir"/mythtv.conf "$pkgdir"/etc/rsyslog.d/mythtv.conf + install -D -m755 "$srcdir"/log_care.sh "$pkgdir"/etc/cron.daily/log_care } -md5sums=('35f0b7024ae7b5677e49f14f36304d77' +md5sums=('789be3f43edae1b20d92c620b04c19de' '61750ec989c319470b466946f6404931' 'd99814eeea48b370b3e0fe2899792fdb' - 'cd39e6edc1fcbbae2093c40c880e0079' - 'aafafdf4502f5e4de5fcfebd21499700') + 'cd39e6edc1fcbbae2093c40c880e0079') diff --git a/abs/core/rsyslog/gnutls.patch b/abs/core/rsyslog/gnutls.patch deleted file mode 100644 index fcf199b..0000000 --- a/abs/core/rsyslog/gnutls.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -wbBur rsyslog-8.9.0.org/runtime/nsd_gtls.c rsyslog-8.9.0/runtime/nsd_gtls.c ---- rsyslog-8.9.0.org/runtime/nsd_gtls.c 2015-03-29 16:00:04.000000000 +0300 -+++ rsyslog-8.9.0/runtime/nsd_gtls.c 2015-04-16 15:42:44.701275194 +0300 -@@ -231,13 +231,13 @@ - gtlsClientCertCallback(gnutls_session_t session, - __attribute__((unused)) const gnutls_datum_t* req_ca_rdn, int __attribute__((unused)) nreqs, - __attribute__((unused)) const gnutls_pk_algorithm_t* sign_algos, int __attribute__((unused)) sign_algos_length, -- gnutls_retr_st *st) -+ gnutls_retr2_st *st) - { - nsd_gtls_t *pThis; - - pThis = (nsd_gtls_t*) gnutls_session_get_ptr(session); - -- st->type = GNUTLS_CRT_X509; -+ st->cert_type = GNUTLS_CRT_X509; - st->ncerts = 1; - st->cert.x509 = &pThis->ourCert; - st->key.x509 = pThis->ourKey; -@@ -1673,14 +1673,14 @@ - gnutls_session_set_ptr(pThis->sess, (void*)pThis); - iRet = gtlsLoadOurCertKey(pThis); /* first load .pem files */ - if(iRet == RS_RET_OK) { -- gnutls_certificate_client_set_retrieve_function(xcred, gtlsClientCertCallback); -+ gnutls_certificate_set_retrieve_function(xcred, gtlsClientCertCallback); - } else if(iRet != RS_RET_CERTLESS) { - FINALIZE; /* we have an error case! */ - } - - /* Use default priorities */ - CHKgnutls(gnutls_set_default_priority(pThis->sess)); -- CHKgnutls(gnutls_certificate_type_set_priority(pThis->sess, cert_type_priority)); -+ CHKgnutls(gnutls_set_default_priority(pThis->sess)); - - /* put the x509 credentials to the current session */ - CHKgnutls(gnutls_credentials_set(pThis->sess, GNUTLS_CRD_CERTIFICATE, xcred)); diff --git a/abs/core/v4l-utils/PKGBUILD b/abs/core/v4l-utils/PKGBUILD index 7ade2db..fcef145 100644 --- a/abs/core/v4l-utils/PKGBUILD +++ b/abs/core/v4l-utils/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils -pkgver=1.6.3 +pkgver=1.10.1 pkgrel=1 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64') @@ -11,11 +11,11 @@ replaces=('libv4l') conflicts=('libv4l') backup=(etc/rc_maps.cfg) license=('LGPL') -makedepends=('qt4') -optdepends=('qt4') +makedepends=('qt5-base' 'alsa-lib') +optdepends=('qt5-base' 'alsa-lib') depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2{,.asc}) -sha256sums=('164abf5c1befcd27e8e6ef824a82d4015bdfb5d99ae82daa00e77d895ff9864c' +sha256sums=('6147ccc29fe7dd3c5c3994d613c4f2a099bac8b44694a96e5cf4d7caca8336c0' 'SKIP') validpgpkeys=('05D0169C26E41593418129DF199A64FADFB500FF') # Gregor Jasny <gjasny@googlemail.com> diff --git a/abs/core/x264/PKGBUILD b/abs/core/x264/PKGBUILD index b3c6a71..061ee76 100644 --- a/abs/core/x264/PKGBUILD +++ b/abs/core/x264/PKGBUILD @@ -1,12 +1,12 @@ # $Id$ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> -# Maintainer: Maxime Gauduin <alucryd@archlinux.org> +# Maintainer: Maxime Gauduin <alucryd@archlinux.org> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=('x264' 'libx264' 'libx264-10bit') -pkgver=148.20150725 +pkgver=148.20160920 pkgrel=1 epoch=2 arch=('i686' 'x86_64') @@ -14,12 +14,13 @@ url='http://www.videolan.org/developers/x264.html' license=('GPL') depends=('glibc') makedepends=('yasm' 'git' 'ffmpeg' 'l-smash') -_commit=73ae2d11d472d0eb3b7c218dc1659db32f649b14 -source=(git://git.videolan.org/x264.git#commit=${_commit}) -md5sums=('SKIP') +_commit='86b71982e131eaa70125f8d0e725fcade9c4c677' +source=("git://git.videolan.org/x264.git#commit=${_commit}") +sha256sums=('SKIP') pkgver() { - cd $pkgname + cd ${pkgbase} + local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3) local _date=$(git log -1 --format="%cd" --date=short | tr -d -) @@ -27,31 +28,38 @@ pkgver() { } prepare() { - cp -r $pkgname $pkgname-10bit + cp -r ${pkgbase} ${pkgbase}-10bit } build() { - cd $pkgname - ./configure --prefix=/usr \ - --enable-shared --enable-pic + cd ${pkgbase} + + ./configure \ + --prefix='/usr' \ + --enable-shared \ + --enable-pic make - cd ../$pkgname-10bit - ./configure --prefix=/usr \ - --enable-shared --enable-pic \ - --bit-depth=10 + cd ../${pkgbase}-10bit + + ./configure \ + --prefix='/usr' \ + --enable-shared \ + --enable-pic \ + --bit-depth='10' make } package_x264() { pkgdesc='CLI tools for encoding H264/AVC video streams' - depends=('ffmpeg' 'liblsmash.so') + depends+=('libavcodec.so' 'libavformat.so' 'libavutil.so' 'liblsmash.so' + 'libswscale.so') provides=('x264-10bit') conflicts=('x264-10bit') replaces=('x264-10bit') - make -C $pkgbase DESTDIR="$pkgdir" install-cli - install -Dm755 $pkgbase-10bit/x264 "$pkgdir"/usr/bin/x264-10bit + make -C ${pkgbase} DESTDIR="${pkgdir}" install-cli + install -m 755 ${pkgbase}-10bit/x264 "${pkgdir}"/usr/bin/x264-10bit } package_libx264() { @@ -60,8 +68,8 @@ package_libx264() { conflicts=('x264-dev') replaces=('x264-dev') - install -d "$pkgdir"/usr/lib - make -C $pkgbase DESTDIR="$pkgdir" install-lib-shared + install -dm 755 "${pkgdir}"/usr/lib + make -C ${pkgbase} DESTDIR="${pkgdir}" install-lib-shared } package_libx264-10bit() { @@ -69,6 +77,8 @@ package_libx264-10bit() { provides=('libx264.so' 'libx264' 'x264-dev') conflicts=('libx264' 'x264-dev') - install -d "$pkgdir"/usr/lib - make -C $pkgbase-10bit DESTDIR="$pkgdir" install-lib-shared + install -dm 755 "${pkgdir}"/usr/lib + make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-lib-shared } + +# vim: ts=2 sw=2 et: diff --git a/abs/core/x265/PKGBUILD b/abs/core/x265/PKGBUILD index bee22f5..1a728d7 100644 --- a/abs/core/x265/PKGBUILD +++ b/abs/core/x265/PKGBUILD @@ -1,10 +1,10 @@ # $Id$ -# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Maintainer: Maxime Gauduin <alucryd@archlinux.org> +# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: kfgz <kfgz@interia.pl> pkgname=x265 -pkgver=1.9 +pkgver=2.2 pkgrel=1 pkgdesc='Open Source H265/HEVC video encoder' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('gcc-libs') makedepends=('yasm' 'cmake') provides=('libx265.so') source=("https://bitbucket.org/multicoreware/x265/downloads/x265_${pkgver}.tar.gz") -md5sums=('f34a1c4c660ff07511365cb0983cf164') +sha256sums=('b872552535e41fbffa03ba7cbcd3479c42c4053868309292e78e147b7773ac4b') prepare() { cd x265_${pkgver} diff --git a/abs/core/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch b/abs/core/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch deleted file mode 100644 index 6aa679d..0000000 --- a/abs/core/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch +++ /dev/null @@ -1,28 +0,0 @@ -# HG changeset patch -# User Deepthi Nandakumar <deepthi@multicorewareinc.com> -# Date 1434559454 -19800 -# Wed Jun 17 22:14:14 2015 +0530 -# Branch stable -# Node ID 98325f22a1bad500e6a0c3372bf8177e81167cae -# Parent e0738af788da598a3cdf4458dbb46fbb07563534 -fix issue #143 x265 is slow when it is build with GCC 5.1 - -diff -r e0738af788da -r 98325f22a1ba source/common/vec/vec-primitives.cpp ---- a/source/common/vec/vec-primitives.cpp Wed May 20 10:29:09 2015 -0500 -+++ b/source/common/vec/vec-primitives.cpp Wed Jun 17 22:14:14 2015 +0530 -@@ -32,12 +32,13 @@ - #define HAVE_SSE4 - #define HAVE_AVX2 - #elif defined(__GNUC__) --#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 3) -+#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) -+#if __clang__ || GCC_VERSION >= 40300 /* gcc_version >= gcc-4.3.0 */ - #define HAVE_SSE3 - #define HAVE_SSSE3 - #define HAVE_SSE4 - #endif --#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 7) -+#if __clang__ || GCC_VERSION >= 40700 /* gcc_version >= gcc-4.7.0 */ - #define HAVE_AVX2 - #endif - #elif defined(_MSC_VER) diff --git a/abs/core/xf86-video-intel/PKGBUILD b/abs/core/xf86-video-intel/PKGBUILD index 51dd19a..8a0a18b 100644 --- a/abs/core/xf86-video-intel/PKGBUILD +++ b/abs/core/xf86-video-intel/PKGBUILD @@ -3,8 +3,8 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -_commit=dad64e9 # 7 digits -pkgver=2.99.917+730+gdad64e9 +_commit=9fe04af # 7 digits +pkgver=2.99.917+753+g9fe04af pkgrel=1 epoch=1 arch=(i686 x86_64) @@ -30,7 +30,6 @@ conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 'X-ABI-VIDEODRV_VERSIO groups=('xorg-drivers' 'xorg') #source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) source=("git://anongit.freedesktop.org/xorg/driver/xf86-video-intel#commit=${_commit}") -sha256sums=('SKIP') pkgver() { cd $pkgname @@ -63,3 +62,4 @@ package() { install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } +md5sums=('SKIP') diff --git a/abs/core/xvidcore/PKGBUILD b/abs/core/xvidcore/PKGBUILD index 360ddd8..237e1bc 100644 --- a/abs/core/xvidcore/PKGBUILD +++ b/abs/core/xvidcore/PKGBUILD @@ -1,33 +1,29 @@ -# $Id: PKGBUILD 126345 2011-06-04 23:54:53Z eric $ -# Maintainer: tobias <tobias@archlinux.org> +# $Id$ +# Maintainer: Tom Gundersen +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor: tobias <tobias@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=xvidcore -pkgver=1.3.2 +pkgver=1.3.4 pkgrel=1 -pkgdesc="XviD is an open source MPEG-4 video codec" +pkgdesc='XviD is an open source MPEG-4 video codec' arch=('i686' 'x86_64') -url="http://www.xvid.org/" +url='http://www.xvid.org/' license=('GPL') depends=('glibc') makedepends=('nasm') -source=(http://downloads.xvid.org/downloads/${pkgname}-${pkgver}.tar.bz2) -md5sums=('34389e980d4f849688f8b1e168f4e2f9') -sha1sums=('74f9ce9c1bebcc9806bf21cb53274b8102700309') +provides=('libxvidcore.so') +source=(http://downloads.xvid.org/downloads/$pkgname-$pkgver.tar.bz2) +md5sums=('5e68b84e3286b7bbaa95ddc34f0fcace') build() { - cd "${srcdir}/${pkgname}/build/generic" + cd $pkgname/build/generic ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}/build/generic" - make DESTDIR="${pkgdir}" install - - #Fix dynamic libraries - cd "${pkgdir}/usr/lib" - _mylib=$(basename libxvidcore.so.*) - ln -sf ${_mylib} libxvidcore.so.4 - ln -sf ${_mylib} libxvidcore.so + cd $pkgname/build/generic + make DESTDIR="$pkgdir" install } diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index e69afd4..4ecc620 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=xymon pkgname=('xymonserver' 'xymonclient') pkgver=4.3.28 -pkgrel=1 +pkgrel=3 pkgdesc="Xymon is a system for monitoring of hosts and networks" license=('GPL') arch=('i686' 'x86_64') @@ -183,11 +183,11 @@ md5sums=('14501ab2cfce9a332c1590543dfcbd0f' '0469d775db9fdd18ea95dd41937ada82' 'c9a31ea9ae131fb351db913e922c25aa' '31ac5c1f6dcc9408b64c4107b325a9a6' - '92bd5e8279c688fd854d514443bc733c' + '1eee1cf4ded13fcef9f3b43faa20dbe1' '80d9cfac86c6d96836e6f406e35e7cf5' 'df77d1de72157d23a301a72288fbf7e5' 'b1d5592fa92ef71303621964e84c2b9e' - '0757294eec13771f8e63da23cf066796' + 'f1146cc034f6d11e7d7e68f24bc89dff' '2a509d81ee1655130ce40bf970719e0a' '313b11e7a22c3c08fb2afaadbfb46d87' 'a0fbb9cbeb3600a40943e6205790f22f' diff --git a/abs/core/xymon/graphs.cfg.diff b/abs/core/xymon/graphs.cfg.diff index 8b1b438..f4d755c 100755 --- a/abs/core/xymon/graphs.cfg.diff +++ b/abs/core/xymon/graphs.cfg.diff @@ -1,21 +1,23 @@ ---- graphs.cfg.orig 2015-03-04 21:46:31.493387574 +0000 -+++ graphs.cfg 2015-03-04 21:47:26.972936010 +0000 -@@ -2100,4 +2100,60 @@ +--- graphs.cfg.orig 2017-01-24 15:11:38.763486866 +0000 ++++ graphs.cfg 2017-01-24 15:10:53.558992118 +0000 +@@ -2111,4 +2111,62 @@ GPRINT:qlen@RRDIDX@:AVERAGE: %6.1lf (avg)\n ########### end of ifmib graphs ########### +[storage] + TITLE Storage Groups -+ YAXIS recordings ++ YAXIS recordings + DEF:storage1=storage.rrd:rectvtotal:AVERAGE -+ LINE2:storage1#00CCCC:current recorded ++ LINE2:storage1#00CCCC:recorded total + DEF:rectime=storage.rrd:rectvtime:AVERAGE -+ LINE2:rectime#000000:current recorded time ++ LINE2:rectime#000000:recorded time (hrs) + -+ DEF:livetime=storage.rrd:livetvtime:AVERAGE -+ LINE2:livetime#00CC11:current live time ++ DEF:storage2=storage.rrd:livetvtotal:AVERAGE ++ LINE2:storage2#FFA500:live total + ++ DEF:livetime=storage.rrd:livetvtime:AVERAGE ++ LINE2:livetime#00CC11:live time (hrs) + +[memmbe] + TITLE Memory usage for MythBackend diff --git a/abs/core/xymon/hobbit-mem-myth.sh b/abs/core/xymon/hobbit-mem-myth.sh index 663e2e3..a373b84 100644 --- a/abs/core/xymon/hobbit-mem-myth.sh +++ b/abs/core/xymon/hobbit-mem-myth.sh @@ -1,9 +1,9 @@ #!/bin/bash + MBEPID=`ps -fU mythtv |grep mythbackend |grep -v runsv|grep -v grep|grep -v logger|awk '{print $2 }'` MFEPID=`ps -ef|grep mythfrontend |grep -v runsv|grep -v grep|grep -v logger|grep -v mythfrontend-start|awk '{print $2 }'` - COLOR=green # By default, everything is OK # Do whatever you need to test for something @@ -19,13 +19,12 @@ MSGMBE=" " # echo $MSGMBE # Tell Hobbit about it - $BB $BBDISP "data $MACHINE.memmbe $COLOR `date` + $BB $BBDISP "status $MACHINE.memmbe $COLOR `date` ${MSGMBE} - " + " fi - if [ ! x$MFEPID = x ] @@ -40,13 +39,9 @@ MSGMBE=" " # echo $MSGMBE # Tell Hobbit about it - $BB $BBDISP "data $MACHINE.memmfe $COLOR `date` + $BB $BBDISP "status $MACHINE.memmfe $COLOR `date` ${MSGMBE} - " + " fi - - - - |