From f5044ec14a7edde4de5b5dcbc4898d1306fdeaae Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 25 Oct 2016 19:03:38 +0000
Subject: linhes-theme: update osd.xml for HEVC codec
change layout of osd debug window
---
abs/core/linhes-theme/PKGBUILD | 12 +--
abs/core/linhes-theme/osd.xml.patch | 204 ++++++++++++++++++++++++++----------
2 files changed, 155 insertions(+), 61 deletions(-)
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index d600f7d..7660af9 100755
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-theme
pkgver=8.4
-pkgrel=9
+pkgrel=10
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -79,11 +79,11 @@ package() {
msg "Modifying yellows and blue to LinHES yellow and blue"
#yellow
- grep -lr '#d9d900' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#d9d900/\#ebb81c/g"
+ grep -lr '#d9d900' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#d9d900/\#ebb81c/g" || return 0
#darkyellow
- grep -lr '#CCCC29' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#CCCC29/\#ebb81c/g"
+ grep -lr '#CCCC29' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#CCCC29/\#ebb81c/g" || return 0
#blue
- grep -lr '#3a9ade' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#3a9ade/\#0072bc/g"
+ grep -lr '#3a9ade' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#3a9ade/\#0072bc/g" || return 0
msg "Modifying fonts to Overlock"
grep -lr 'DejaVu Sans' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\DejaVu Sans/\Overlock/g"
@@ -94,7 +94,7 @@ package() {
sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
}
md5sums=('2dca856c2a4d1f959473512c94e43b60'
- '0d95c596b460de777e12b89da0bf2e19'
+ '0383edbb16b0d15f47492cde738f164b'
'f2b9c85519e80843294315a42870e582'
'43b1f213fd392fb07aac503e775e27bc'
'80bb72994eca59ca6dc9034ac185e7cc'
@@ -113,6 +113,6 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60'
'e8dee86a10ce7c4423a97305b38b4668'
'e8ac15e38b3dc99c9e889e439ba356de'
'e8cf0d3a55ba3be47deae55c05432141'
- 'bcc89120aba113ca204534dbbbaee60d'
+ '58834fbee0230c713802c61e635cbab0'
'b51ef0cbf8ed2d3a8c1a8257a89aceff'
'09ad14842f828b7a8d24070ec8214fe5')
diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch
index efe4838..d4b225b 100644
--- a/abs/core/linhes-theme/osd.xml.patch
+++ b/abs/core/linhes-theme/osd.xml.patch
@@ -1,5 +1,5 @@
---- osd.xml.orig 2016-10-10 19:48:08.091427236 +0000
-+++ osd.xml 2016-10-10 19:40:05.992756927 +0000
+--- osd.xml.orig 2016-10-25 18:54:13.696402426 +0000
++++ osd.xml 2016-10-25 18:53:00.649172353 +0000
@@ -7,13 +7,13 @@
<window name="osd_debug">
<area>0,0,1280,720</area>
@@ -17,79 +17,157 @@
</fontdef>
<shape name="osd-debug-backdrop">
-@@ -71,7 +71,7 @@
+@@ -63,109 +63,97 @@
+ <area>1212,40,2,120</area>
+ </shape>
+
+- <textarea name="cpuload">
++ <textarea name="file">
+ <font>medium</font>
+- <area>74,51,162,25</area>
++ <area>74,51,132,25</area>
+ <align>right,vcenter</align>
+- <value>CPUs :</value>
++ <value>File :</value>
</textarea>
- <textarea name="load">
+- <textarea name="load">
- <font>mediumblue</font>
+- <area>241,51,216,25</area>
++ <textarea name="filename">
+ <font>medium</font>
- <area>241,51,216,25</area>
++ <area>211,51,995,25</area>
<align>left,vcenter</align>
</textarea>
-@@ -84,7 +84,7 @@
+
+- <textarea name="file">
++ <textarea name="cpuload">
+ <font>medium</font>
+- <area>450,51,60,25</area>
++ <area>74,76,132,25</area>
+ <align>right,vcenter</align>
+- <value>File :</value>
++ <value>CPUs :</value>
</textarea>
- <textarea name="filename">
+- <textarea name="filename">
- <font>mediumblue</font>
+- <area>515,51,685,25</area>
++ <textarea name="load">
+ <font>medium</font>
- <area>515,51,685,25</area>
++ <area>211,76,169,25</area>
<align>left,vcenter</align>
</textarea>
-@@ -97,7 +97,7 @@
+
+- <textarea name="storage">
++ <textarea name="video">
+ <font>medium</font>
+- <area>74,76,162,25</area>
++ <area>74,101,132,25</area>
+ <align>right,vcenter</align>
+- <value>Storage to Buffer :</value>
++ <value>Video :</value>
</textarea>
- <textarea name="storagerate">
+- <textarea name="storagerate">
- <font>mediumblue</font>
+- <area>247,76,123,25</area>
++ <textarea name="videowidth">
+ <font>medium</font>
- <area>247,76,123,25</area>
++ <area>211,101,169,25</area>
<align>left,vcenter</align>
++ <template>%VIDEOWIDTH%x%VIDEOHEIGHT%@%VIDEOFRAMERATE%fps</template>
</textarea>
-@@ -110,7 +110,7 @@
+
+- <textarea name="decoder">
++ <textarea name="vidcodec">
+ <font>medium</font>
+- <area>74,101,162,25</area>
++ <area>74,126,132,25</area>
+ <align>right,vcenter</align>
+- <value>Buffer to Decoder :</value>
++ <value>Codec/Decoder :</value>
</textarea>
- <textarea name="decoderrate">
+- <textarea name="decoderrate">
- <font>mediumblue</font>
+- <area>247,101,123,25</area>
++ <textarea name="videocodec">
+ <font>medium</font>
- <area>247,101,123,25</area>
++ <area>211,126,169,25</area>
<align>left,vcenter</align>
++ <template>%VIDEOCODEC%/%VIDEODECODER%</template>
</textarea>
-@@ -123,7 +123,7 @@
+
+ <textarea name="buffer">
+ <font>medium</font>
+- <area>74,126,162,25</area>
++ <area>385,76,160,25</area>
+ <align>right,vcenter</align>
+ <value>Available Buffer :</value>
</textarea>
<textarea name="bufferavail">
- <font>mediumblue</font>
+- <area>247,126,123,25</area>
+ <font>medium</font>
- <area>247,126,123,25</area>
++ <area>550,76,123,25</area>
<align>left,vcenter</align>
<template>%BUFFERAVAIL% of %BUFFERSIZE%Mb</template>
-@@ -137,7 +137,7 @@
</textarea>
- <textarea name="videowidth">
+- <textarea name="video">
++ <textarea name="storage">
+ <font>medium</font>
+- <area>410,76,100,25</area>
++ <area>385,101,160,25</area>
+ <align>right,vcenter</align>
+- <value>Video :</value>
+- </textarea>
+-
+- <textarea name="videowidth">
- <font>mediumblue</font>
-+ <font>medium</font>
- <area>515,76,250,25</area>
- <align>left,vcenter</align>
- <template>%VIDEOWIDTH%x%VIDEOHEIGHT%@%VIDEOFRAMERATE%fps</template>
-@@ -151,7 +151,7 @@
- </textarea>
-
- <textarea name="videocodec">
+- <area>515,76,250,25</area>
+- <align>left,vcenter</align>
+- <template>%VIDEOWIDTH%x%VIDEOHEIGHT%@%VIDEOFRAMERATE%fps</template>
++ <value>Storage to Buffer :</value>
+ </textarea>
+
+- <textarea name="vidcodec">
++ <textarea name="storagerate">
+ <font>medium</font>
+- <area>410,101,100,25</area>
+- <align>right,vcenter</align>
+- <value>Codec :</value>
+- </textarea>
+-
+- <textarea name="videocodec">
- <font>mediumblue</font>
-+ <font>medium</font>
- <area>515,101,150,25</area>
+- <area>515,101,150,25</area>
++ <area>550,101,123,25</area>
<align>left,vcenter</align>
</textarea>
-@@ -164,7 +164,7 @@
+
+- <textarea name="viddec">
++ <textarea name="decoder">
+ <font>medium</font>
+- <area>410,126,100,25</area>
++ <area>385,126,160,25</area>
+ <align>right,vcenter</align>
+- <value>Decoder :</value>
++ <value>Buffer to Decoder :</value>
</textarea>
- <textarea name="videodecoder">
+- <textarea name="videodecoder">
- <font>mediumblue</font>
+- <area>515,126,150,25</area>
++ <textarea name="decoderrate">
+ <font>medium</font>
- <area>515,126,150,25</area>
++ <area>550,126,123,25</area>
<align>left,vcenter</align>
</textarea>
-@@ -177,7 +177,7 @@
+
+@@ -177,7 +165,7 @@
</textarea>
<textarea name="avsync">
@@ -98,7 +176,7 @@
<area>875,76,100,25</area>
<align>left,vcenter</align>
</textarea>
-@@ -190,7 +190,7 @@
+@@ -190,7 +178,7 @@
</textarea>
<textarea name="framerate">
@@ -107,7 +185,7 @@
<area>875,101,100,25</area>
<align>left,vcenter</align>
</textarea>
-@@ -203,7 +203,7 @@
+@@ -203,7 +191,7 @@
</textarea>
<textarea name="videoframes">
@@ -116,7 +194,7 @@
<area>875,126,100,25</area>
<align>left,vcenter</align>
</textarea>
-@@ -216,7 +216,7 @@
+@@ -216,7 +204,7 @@
</textarea>
<textarea name="audiocodec">
@@ -125,7 +203,7 @@
<area>1129,76,77,25</area>
<align>left,vcenter</align>
</textarea>
-@@ -229,7 +229,7 @@
+@@ -229,7 +217,7 @@
</textarea>
<textarea name="audiochannels">
@@ -134,7 +212,7 @@
<area>1129,101,77,25</area>
<align>left,vcenter</align>
</textarea>
-@@ -242,7 +242,7 @@
+@@ -242,7 +230,7 @@
</textarea>
<textarea name="samplerate">
@@ -143,7 +221,7 @@
<area>1129,126,77,25</area>
<align>left,vcenter</align>
</textarea>
-@@ -252,8 +252,8 @@
+@@ -252,8 +240,8 @@
<window name="osd_message">
<area>0,0,1280,720</area>
@@ -154,7 +232,7 @@
<color>#e6e6e6</color>
</fontdef>
-@@ -315,9 +315,9 @@
+@@ -315,9 +303,9 @@
<window name="osd_input">
<area>0,0,1280,720</area>
@@ -166,7 +244,7 @@
</fontdef>
<shape name="osd-input-backdrop">
-@@ -378,9 +378,9 @@
+@@ -378,9 +366,9 @@
<window name="osd_status">
<area>0,0,1280,720</area>
@@ -178,7 +256,7 @@
</fontdef>
<shape name="osd-status-backdrop">
-@@ -436,12 +436,19 @@
+@@ -436,12 +424,19 @@
<align>left,vcenter</align>
</textarea>
@@ -202,7 +280,7 @@
</textarea>
<clock name="clock">
-@@ -470,39 +477,39 @@
+@@ -470,39 +465,39 @@
<window name="program_info">
<area>0,0,1280,720</area>
@@ -252,7 +330,23 @@
</fontdef>
<shape name="program-info-backdrop">
-@@ -988,7 +995,7 @@
+@@ -865,6 +860,15 @@
+ <value>VideoCodec: H.264</value>
+ </textarea>
+ </state>
++ <state name="HEVC">
++ <textarea name="HEVC">
++ <area>830,432,180,16</area>
++ <font>supersmallblue</font>
++ <cutdown>no</cutdown>
++ <align>allcenter</align>
++ <value>VideoCodec: HEVC</value>
++ </textarea>
++ </state>
+ <state name="MPEG-4">
+ <textarea name="MPEG-4">
+ <area>830,432,180,16</area>
+@@ -988,7 +992,7 @@
<alpha>255</alpha>
</imagetype>
@@ -261,7 +355,7 @@
<font>supersmallblue</font>
<area>284,490,912,28</area>
<align>allcenter</align>
-@@ -1003,37 +1010,49 @@
+@@ -1003,37 +1007,49 @@
<template>%"|SUBTITLE|" %%YEARSTARS| %%DESCRIPTION%</template>
</textarea>
@@ -318,7 +412,7 @@
</fontdef>
<shape name="browse-info-backdrop">
-@@ -1084,7 +1103,7 @@
+@@ -1084,7 +1100,7 @@
</shape>
<shape name="title-backdrop-line">
@@ -327,7 +421,7 @@
<type>roundbox</type>
<fill color="#000000" alpha="0" />
<line color="#ffffff" alpha="45" width="2" />
-@@ -1092,11 +1111,11 @@
+@@ -1092,11 +1108,11 @@
</shape>
<shape name="title-top-line" from="channel-top-line">
@@ -341,7 +435,7 @@
</shape>
<shape name="title-left-line" from="channel-left-line">
-@@ -1104,30 +1123,6 @@
+@@ -1104,30 +1120,6 @@
</shape>
<shape name="title-right-line" from="channel-left-line">
@@ -372,7 +466,7 @@
<area>1212,492,2,62</area>
</shape>
-@@ -1175,30 +1170,30 @@
+@@ -1175,30 +1167,30 @@
</textarea>
<textarea name="title">
@@ -410,7 +504,7 @@
</clock>
<textarea name="description">
-@@ -1214,9 +1209,9 @@
+@@ -1214,9 +1206,9 @@
<window name="ChannelEditor">
<area>0,0,1280,720</area>
@@ -422,7 +516,7 @@
</fontdef>
<fontdef name="smallblack" from="small">
-@@ -1224,7 +1219,7 @@
+@@ -1224,7 +1216,7 @@
</fontdef>
<fontdef name="smallblue" from="small">
@@ -431,7 +525,7 @@
</fontdef>
<fontdef name="smallgrey" from="small">
-@@ -1232,7 +1227,7 @@
+@@ -1232,7 +1224,7 @@
</fontdef>
<fontdef name="medium" from="small">
@@ -440,7 +534,7 @@
</fontdef>
<shape name="channel-editor-backdrop">
-@@ -1610,9 +1605,9 @@
+@@ -1610,9 +1602,9 @@
<window name="osd_program_editor">
<area>0,0,1280,720</area>
@@ -452,7 +546,7 @@
</fontdef>
<shape name="osd-program-editor-backdrop">
-@@ -1663,13 +1658,17 @@
+@@ -1663,13 +1655,17 @@
</shape>
<textarea name="title">
@@ -473,7 +567,7 @@
<align>right,vcenter</align>
</textarea>
-@@ -1749,9 +1748,9 @@
+@@ -1749,9 +1745,9 @@
<window name="MythPopupBox">
<area>0,0,1280,720</area>
@@ -485,7 +579,7 @@
</fontdef>
<fontdef name="smallgrey" from="small">
-@@ -1759,7 +1758,7 @@
+@@ -1759,7 +1755,7 @@
</fontdef>
<fontdef name="smallyellow" from="small">
--
cgit v0.12
From 9360748bfbb238551b4c1eef8f1b9ef2e90cbce0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 31 Oct 2016 13:22:55 +0000
Subject: bash-completion: initial inclusion
---
abs/extra/bash-completion/PKGBUILD | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 abs/extra/bash-completion/PKGBUILD
diff --git a/abs/extra/bash-completion/PKGBUILD b/abs/extra/bash-completion/PKGBUILD
new file mode 100644
index 0000000..575e523
--- /dev/null
+++ b/abs/extra/bash-completion/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=bash-completion
+pkgver=2.4
+pkgrel=1
+pkgdesc="Programmable completion for the bash shell"
+arch=('any')
+url="https://github.com/scop/bash-completion"
+license=('GPL2')
+depends=('bash')
+options=('!emptydirs' '!makeflags')
+source=("https://github.com/scop/bash-completion/releases/download/$pkgver/$pkgname-$pkgver.tar.xz")
+sha1sums=('c02fb9c0f669d178f678c291ea17ddadfd011250')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+# bash-completion is sourced in /etc/bash.bashrc so that non-bash shell don't source it
+ rm "${pkgdir}/etc/profile.d/bash_completion.sh"
+
+# remove Slackware's makepkg completion
+ rm "${pkgdir}/usr/share/bash-completion/completions/makepkg"
+
+# remove completions which overlap with util-linux
+ rm "${pkgdir}/usr/share/bash-completion/completions"/{u,}mount
+}
--
cgit v0.12
From 5b60637fcd8f7a2fa3dcd7d27d7667ee8d966595 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 7 Nov 2016 13:37:16 +0000
Subject: plex-media-server: update to 1.2.6
---
abs/extra/plex-media-server/PKGBUILD | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/abs/extra/plex-media-server/PKGBUILD b/abs/extra/plex-media-server/PKGBUILD
index 5822e7d..4f7a6e4 100644
--- a/abs/extra/plex-media-server/PKGBUILD
+++ b/abs/extra/plex-media-server/PKGBUILD
@@ -7,11 +7,11 @@
# Contributor: Praekon <praekon@googlemail.com>
pkgname=plex-media-server
-pkgver=1.1.4.2757
-_pkgsum=24ffd60
+pkgver=1.2.6.2975
+_pkgsum=9394c87
pkgrel=1
pkgdesc='Plex Media Server'
-arch=('x86_64')
+arch=('armv7h' 'i686' 'x86_64')
url='https://plex.tv/'
license=('custom')
depends=('systemd')
@@ -24,14 +24,11 @@ install='plex-media-server.install'
source=('plexmediaserver.conf.d'
'plexmediaserver.service'
'plex.sysusers'
- 'terms.txt'
- 'plexmediascanner.sh')
-#source_armv7h=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/PlexMediaServer-${pkgver}-${_pkgsum}-arm7.spk")
-#source_i686=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/plexmediaserver-${pkgver}-${_pkgsum}.i386.rpm")
+ 'plexmediascanner.sh'
+ 'terms.txt')
+source_armv7h=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/PlexMediaServer-${pkgver}-${_pkgsum}-arm7.spk")
+source_i686=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/plexmediaserver-${pkgver}-${_pkgsum}.i386.rpm")
source_x86_64=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/plexmediaserver-${pkgver}-${_pkgsum}.x86_64.rpm")
-#sha256sums_armv7h=('1a7b7610eb7f1857cece6290d3786022cef337cee062ee5b984ec94761bb0c6e')
-#sha256sums_i686=('2d2a71a50b6a95fc91c64c01ea2ec2bba2aedd80068481c441106551ed7eeae9')
-#sha256sums_x86_64=('99821d4795a50e5ce9ceb7947d21c7418b328d014a00b6390e4a2913ed189192')
prepare() {
@@ -50,8 +47,6 @@ package() {
install -m 644 plexmediaserver.conf.d "${pkgdir}"/etc/conf.d/plexmediaserver
install -Dm 644 "$srcdir/plex.sysusers" "$pkgdir/usr/lib/sysusers.d/plex.conf"
- install -m 755 -D plexmediascanner.sh "${pkgdir}"/usr/LH/bin/plexmediascanner.sh
-
install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname}
install -m 644 terms.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
}
@@ -60,6 +55,8 @@ package() {
md5sums=('dfd6778f5c0d3d64c2c3a71dca02b7cc'
'3f39ee0e8b1ebb1c7ca714f67fa88641'
'97241861f2c0b7c82d1945a6c5de8e35'
- 'bd703bc750b989a27edd590eb8c8e9d7'
- '506ec15815bba749a743780edd2323c8')
-md5sums_x86_64=('5a5607d8a37c21065e2879bf312efd6c')
+ '506ec15815bba749a743780edd2323c8'
+ 'bd703bc750b989a27edd590eb8c8e9d7')
+md5sums_armv7h=('567cf499157085c66e1695d9f5a9b784')
+md5sums_i686=('52af0992e8cc78b567158e20efdf0994')
+md5sums_x86_64=('4545bc343ebefd686bf67930a8c61d07')
--
cgit v0.12
From 20d8a2e06205c6711a89cc8ca7f39c8905e638ac Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 7 Nov 2016 13:52:34 +0000
Subject: google-chrome: update to 54.0.2840.90
---
abs/extra/google-chrome/PKGBUILD | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index feafbec..959f80d 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,7 +5,7 @@
# or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
pkgname=google-chrome
-pkgver=54.0.2840.71
+pkgver=54.0.2840.90
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('x86_64')
@@ -22,9 +22,6 @@ _channel=stable
source=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb"
"$url/browser/privacy/eula_text.html"
'google-chrome-stable.sh')
-md5sums=('9405b4f4ddb6b40b5c5aa260a1566984'
- 'SKIP'
- '99fa93d5e7fb5d622cef0f9621f3ffa3')
package() {
msg2 "Extracting the data.tar.xz..."
@@ -59,3 +56,6 @@ package() {
msg2 "Rename google-chrome-stable to google-chrome..."
mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome
}
+md5sums=('f65863914e5f83d5f88094af93c85021'
+ 'da54da9383ddffa44c5db45513239da2'
+ '99fa93d5e7fb5d622cef0f9621f3ffa3')
--
cgit v0.12
From 309e5452253e25d7dc981b427309276201d09454 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 7 Nov 2016 18:50:44 +0000
Subject: mythtv & mythplugins: update to latest fixes
---
abs/core/mythtv/stable-0.28/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.28/mythtv/PKGBUILD | 4 ++--
.../stable-0.28/mythtv/add_categorytype_Program.pm.patch | 10 ++++++++++
4 files changed, 14 insertions(+), 4 deletions(-)
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 b558f7e..abc71d9 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 @@
-7f8f1688e882cd0587097fe4867e20d8fa122cce
+1434df8592ad6bf1eae4fd2eb46955e0adedc8aa
diff --git a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
index 4f74b0e..18159aa 100644
--- a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.28
-pkgrel=23
+pkgrel=24
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
diff --git a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD
index 08c1aed..bf84d4c 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=23
+pkgrel=24
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
@@ -113,7 +113,7 @@ md5sums=('e30b482dcd5f3e71c6419fd753bab2b1'
'f8a56ac814722b110dc9859169b9bda9'
'1cd668136deea20efb79cf3e6310effc'
'62c42b1043ebf65959fa9eced9ca3ed8'
- 'a38f26576662afdc02d11c7096839321'
+ 'fa836371ebeb3be5b9855be8dd016f82'
'0f674b9cad031ba1e03aaf6b5ee1499f'
'6add9c16bbb988067e82029327e567b2'
'e73bb7c5036e44a68b6f6aa2f1bac077')
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
index 0bff554..d84420d 100644
--- 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
@@ -8,3 +8,13 @@
($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
--
cgit v0.12
From 72fb840708e32235398bbc5cf77fad2d2fd7ee1e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 7 Nov 2016 21:46:35 +0000
Subject: lsof: update to 4.89
---
abs/core/lsof/PKGBUILD | 49 +++++++++++++++++++++++++++----------------------
1 file changed, 27 insertions(+), 22 deletions(-)
diff --git a/abs/core/lsof/PKGBUILD b/abs/core/lsof/PKGBUILD
index 4cfc24f..7d25f4c 100644
--- a/abs/core/lsof/PKGBUILD
+++ b/abs/core/lsof/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187064 2013-06-03 11:16:43Z allan $
+# $Id$
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,39 +6,44 @@
# Contributor: Jochem Kossen <j.kossen@home.nl>
pkgname=lsof
-pkgver=4.87
-pkgrel=2
+pkgver=4.89
+pkgrel=1
pkgdesc="Lists open files for running Unix processes"
arch=('i686' 'x86_64')
url="http://people.freebsd.org/~abe/"
license=('custom')
depends=('glibc')
-source=(ftp://sunsite.ualberta.ca/pub/Mirror/lsof/${pkgname}_${pkgver}.tar.bz2 license.txt)
+source=(ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/lsof_$pkgver.tar.bz2
+ license.txt)
+sha1sums=('ea8fb2588c9732f1b22d73ffab17dd055590df2c'
+ 'db6b6d90ce895e4053f91ad25c7761fbf9a37dd6')
+#validpgpkeys=(9AFD62A840BD3D55) It is PGP-2 key
-build() {
- cd ${srcdir}/${pkgname}_${pkgver}
- tar xf ${pkgname}_${pkgver}_src.tar
- cd ${pkgname}_${pkgver}_src
+prepare() {
+ cd lsof_$pkgver
+ tar xf lsof_${pkgver}_src.tar
+ cd lsof_${pkgver}_src
sed -i 's|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|' dialects/linux/machine.h
+}
+
+build() {
+ cd lsof_$pkgver/lsof_${pkgver}_src
./Configure -n linux
make
}
-package() {
- cd ${srcdir}/${pkgname}_${pkgver}/${pkgname}_${pkgver}_src
+check() {
+ cd lsof_$pkgver/lsof_${pkgver}_src/tests
+ sed 's/END=0/exit 0/' -i CkTestDB
+ make all
+}
- FILES=("00CREDITS" "00DCACHE" "00DIALECTS" "00DIST" "00FAQ" "00LSOF-L" "00MANIFEST" "00PORTING" "00QUICKSTART" "00README" "00.README.FIRST" "00TEST" "00XCONFIG")
- for file in "${FILES[@]}"
- do
- install -D -m0644 -o root -g root $file \
- $pkgdir/usr/share/doc/$pkgname/$file
- done
+package() {
+ cd lsof_$pkgver/lsof_${pkgver}_src
- install -Dm0755 -o root -g root lsof ${pkgdir}/usr/bin/lsof
- install -Dm0644 -o root -g root lsof.8 ${pkgdir}/usr/share/man/man8/lsof.8
+ install -Dm0755 lsof "$pkgdir"/usr/bin/lsof
+ install -Dm0644 lsof.8 "$pkgdir"/usr/share/man/man8/lsof.8
- install -D -m0644 -o root -g root ${srcdir}/license.txt \
- ${pkgdir}/usr/share/licenses/lsof/LICENSE
+ install -D -m0644 "$srcdir"/license.txt \
+ "$pkgdir"/usr/share/licenses/lsof/LICENSE
}
-md5sums=('80e2a76d0e05826db910ec88e631296c'
- '1b63c76bd10437cabf890508c8e58d36')
--
cgit v0.12
From 9ceea0bd22afd03b6121ea96961248787a2c1014 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 11 Nov 2016 19:22:31 +0000
Subject: plex-media-server: update to 1.2.6.2975
---
abs/extra/plex-media-server/PKGBUILD | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/abs/extra/plex-media-server/PKGBUILD b/abs/extra/plex-media-server/PKGBUILD
index 4f7a6e4..e85c821 100644
--- a/abs/extra/plex-media-server/PKGBUILD
+++ b/abs/extra/plex-media-server/PKGBUILD
@@ -7,8 +7,8 @@
# Contributor: Praekon <praekon@googlemail.com>
pkgname=plex-media-server
-pkgver=1.2.6.2975
-_pkgsum=9394c87
+pkgver=1.2.7.2987
+_pkgsum=1bef33a
pkgrel=1
pkgdesc='Plex Media Server'
arch=('armv7h' 'i686' 'x86_64')
@@ -57,6 +57,6 @@ md5sums=('dfd6778f5c0d3d64c2c3a71dca02b7cc'
'97241861f2c0b7c82d1945a6c5de8e35'
'506ec15815bba749a743780edd2323c8'
'bd703bc750b989a27edd590eb8c8e9d7')
-md5sums_armv7h=('567cf499157085c66e1695d9f5a9b784')
-md5sums_i686=('52af0992e8cc78b567158e20efdf0994')
-md5sums_x86_64=('4545bc343ebefd686bf67930a8c61d07')
+md5sums_armv7h=('cca403ab622a87240e4060473acd0d6a')
+md5sums_i686=('18919ac4bac1f8e2d413c24e0fb4cb87')
+md5sums_x86_64=('703274f93a3dcac3cbbf1ab9d70a5af6')
--
cgit v0.12
From 5c246b413cfd03fd9cab2ed282aa95334e810a12 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 14 Nov 2016 22:02:39 +0000
Subject: make: update to 4.2.1
---
abs/core/make/PKGBUILD | 17 ++-
abs/core/make/make-3.82-bug30612.patch | 91 ----------------
abs/core/make/make-3.82-bug30723.patch | 12 ---
.../make/make-3.82-dont-prune-intermediate.patch | 57 ----------
abs/core/make/make-3.82-expensive_glob.patch | 116 ---------------------
abs/core/make/make-3.82-makeflags.patch | 36 -------
abs/core/make/make-3.82-sort-blank.patch | 17 ---
abs/core/make/make.install | 20 ----
8 files changed, 8 insertions(+), 358 deletions(-)
delete mode 100644 abs/core/make/make-3.82-bug30612.patch
delete mode 100644 abs/core/make/make-3.82-bug30723.patch
delete mode 100644 abs/core/make/make-3.82-dont-prune-intermediate.patch
delete mode 100644 abs/core/make/make-3.82-expensive_glob.patch
delete mode 100644 abs/core/make/make-3.82-makeflags.patch
delete mode 100644 abs/core/make/make-3.82-sort-blank.patch
delete mode 100644 abs/core/make/make.install
diff --git a/abs/core/make/PKGBUILD b/abs/core/make/PKGBUILD
index 8851f98..91f2da8 100644
--- a/abs/core/make/PKGBUILD
+++ b/abs/core/make/PKGBUILD
@@ -3,33 +3,32 @@
# Contributor: judd <jvinet@zeroflux.org>
pkgname=make
-pkgver=4.1
-pkgrel=2
+pkgver=4.2.1
+pkgrel=1
pkgdesc="GNU make utility to maintain groups of programs"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/make"
license=('GPL3')
groups=('base-devel')
-depends=('glibc' 'sh' 'guile')
-install=$pkgname.install
+depends=('glibc' 'guile')
source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('57a7a224a822f94789a587ccbcedff69'
+md5sums=('15b012617e7c44c0ed482721629577ac'
'SKIP')
validpgpkeys=('3D2554F0A15338AB9AF1BB9D96B047156338B6D4') # Paul Smith
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr
make
}
check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make check
+ cd ${pkgname}-${pkgver}
+ make -k check
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
}
diff --git a/abs/core/make/make-3.82-bug30612.patch b/abs/core/make/make-3.82-bug30612.patch
deleted file mode 100644
index 9867a15..0000000
--- a/abs/core/make/make-3.82-bug30612.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000
-+++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000
-@@ -1,3 +1,4 @@
-+
- /* Argument parsing and main program of GNU Make.
- Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
- 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-@@ -1138,7 +1139,7 @@
- a macro and some compilers (MSVC) don't like conditionals in macros. */
- {
- const char *features = "target-specific order-only second-expansion"
-- " else-if shortest-stem undefine"
-+ " else-if shortest-stem undefine oneshell"
- #ifndef NO_ARCHIVES
- " archives"
- #endif
-diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c
---- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000
-+++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000
-@@ -3028,7 +3028,7 @@
- {
- /* This looks like the first element in an open archive group.
- A valid group MUST have ')' as the last character. */
-- const char *e = p + nlen;
-+ const char *e = p;
- do
- {
- e = next_token (e);
-@@ -3084,19 +3084,19 @@
- Go to the next item in the string. */
- if (flags & PARSEFS_NOGLOB)
- {
-- NEWELT (concat (2, prefix, tp));
-+ NEWELT (concat (2, prefix, tmpbuf));
- continue;
- }
-
- /* If we get here we know we're doing glob expansion.
- TP is a string in tmpbuf. NLEN is no longer used.
- We may need to do more work: after this NAME will be set. */
-- name = tp;
-+ name = tmpbuf;
-
- /* Expand tilde if applicable. */
-- if (tp[0] == '~')
-+ if (tmpbuf[0] == '~')
- {
-- tildep = tilde_expand (tp);
-+ tildep = tilde_expand (tmpbuf);
- if (tildep != 0)
- name = tildep;
- }
-@@ -3152,7 +3152,11 @@
- else
- {
- /* We got a chain of items. Attach them. */
-- (*newp)->next = found;
-+ if (*newp)
-+ (*newp)->next = found;
-+ else
-+ *newp = found;
-+
-
- /* Find and set the new end. Massage names if necessary. */
- while (1)
-diff --git make-3.82-orig/read.c make-3.82-fix30612/read.c
-index c87d4a7..b012094 100644
---- make-3.82-orig/read.c
-+++ make-3.82-fix30612/read.c
-@@ -3044,16 +3044,16 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar,
- nlen -= (n + 1) - tp;
- tp = n + 1;
-
-- /* If we have just "lib(", part of something like
-- "lib( a b)", go to the next item. */
-- if (! nlen)
-- continue;
--
- /* We can stop looking now. */
- break;
- }
- }
- while (*e != '\0');
-+
-+ /* If we have just "lib(", part of something like "lib( a b)",
-+ go to the next item. */
-+ if (! nlen)
-+ continue;
- }
- }
-
diff --git a/abs/core/make/make-3.82-bug30723.patch b/abs/core/make/make-3.82-bug30723.patch
deleted file mode 100644
index 84e7ebe..0000000
--- a/abs/core/make/make-3.82-bug30723.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c
---- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000
-+++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000
-@@ -2093,7 +2093,7 @@
- const char *pv = define_makeflags (1, 1);
- char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
- sprintf (p, "MAKEFLAGS=%s", pv);
-- putenv (p);
-+ putenv (allocated_variable_expand (p));
- }
-
- if (ISDB (DB_BASIC))
diff --git a/abs/core/make/make-3.82-dont-prune-intermediate.patch b/abs/core/make/make-3.82-dont-prune-intermediate.patch
deleted file mode 100644
index f4f47dd..0000000
--- a/abs/core/make/make-3.82-dont-prune-intermediate.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-2012-09-09 Paul Smith <psmith@gnu.org>
-
- * remake.c (update_file_1): Force intermediate files to be
- considered, not pruned, if their non-intermediate parent needs to
- be remade. Fixes Savannah bug #30653.
-
-Index: remake.c
-===================================================================
-RCS file: /sources/make/make/remake.c,v
-retrieving revision 1.153
-retrieving revision 1.154
-diff -u -r1.153 -r1.154
---- remake.c 5 Mar 2012 14:10:45 -0000 1.153
-+++ remake.c 10 Sep 2012 02:36:05 -0000 1.154
-@@ -612,6 +612,10 @@
- d->file->dontcare = file->dontcare;
- }
-
-+ /* We may have already considered this file, when we didn't know
-+ we'd need to update it. Force update_file() to consider it and
-+ not prune it. */
-+ d->file->considered = !considered;
-
- dep_status |= update_file (d->file, depth);
-
-Index: tests/scripts/features/parallelism
-===================================================================
-RCS file: /sources/make/make/tests/scripts/features/parallelism,v
-retrieving revision 1.19
-retrieving revision 1.20
-diff -u -r1.19 -r1.20
---- tests/scripts/features/parallelism 4 Mar 2012 00:24:32 -0000 1.19
-+++ tests/scripts/features/parallelism 10 Sep 2012 02:36:05 -0000 1.20
-@@ -214,6 +214,23 @@
- rmfiles(qw(foo.y foo.y.in main.bar));
- }
-
-+# Ensure intermediate/secondary files are not pruned incorrectly.
-+# See Savannah bug #30653
-+
-+utouch(-15, 'file2');
-+utouch(-10, 'file4');
-+utouch(-5, 'file1');
-+
-+run_make_test(q!
-+.INTERMEDIATE: file3
-+file4: file3 ; @mv -f $< $@
-+file3: file2 ; touch $@
-+file2: file1 ; @touch $@
-+!,
-+ '--no-print-directory -j2', "touch file3");
-+
-+#rmfiles('file1', 'file2', 'file3', 'file4');
-+
- if ($all_tests) {
- # Jobserver FD handling is messed up in some way.
- # Savannah bug #28189
diff --git a/abs/core/make/make-3.82-expensive_glob.patch b/abs/core/make/make-3.82-expensive_glob.patch
deleted file mode 100644
index 8663f50..0000000
--- a/abs/core/make/make-3.82-expensive_glob.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Index: read.c
-===================================================================
-RCS file: /sources/make/make/read.c,v
-retrieving revision 1.198
-retrieving revision 1.200
-diff -u -r1.198 -r1.200
---- read.c 29 Apr 2011 15:27:39 -0000 1.198
-+++ read.c 7 May 2011 14:36:12 -0000 1.200
-@@ -2901,6 +2901,7 @@
- const char *name;
- const char **nlist = 0;
- char *tildep = 0;
-+ int globme = 1;
- #ifndef NO_ARCHIVES
- char *arname = 0;
- char *memname = 0;
-@@ -3109,32 +3110,40 @@
- }
- #endif /* !NO_ARCHIVES */
-
-- switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
-- {
-- case GLOB_NOSPACE:
-- fatal (NILF, _("virtual memory exhausted"));
--
-- case 0:
-- /* Success. */
-- i = gl.gl_pathc;
-- nlist = (const char **)gl.gl_pathv;
-- break;
--
-- case GLOB_NOMATCH:
-- /* If we want only existing items, skip this one. */
-- if (flags & PARSEFS_EXISTS)
-- {
-- i = 0;
-- break;
-- }
-- /* FALLTHROUGH */
--
-- default:
-- /* By default keep this name. */
-+ /* glob() is expensive: don't call it unless we need to. */
-+ if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
-+ {
-+ globme = 0;
- i = 1;
- nlist = &name;
-- break;
-- }
-+ }
-+ else
-+ switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
-+ {
-+ case GLOB_NOSPACE:
-+ fatal (NILF, _("virtual memory exhausted"));
-+
-+ case 0:
-+ /* Success. */
-+ i = gl.gl_pathc;
-+ nlist = (const char **)gl.gl_pathv;
-+ break;
-+
-+ case GLOB_NOMATCH:
-+ /* If we want only existing items, skip this one. */
-+ if (flags & PARSEFS_EXISTS)
-+ {
-+ i = 0;
-+ break;
-+ }
-+ /* FALLTHROUGH */
-+
-+ default:
-+ /* By default keep this name. */
-+ i = 1;
-+ nlist = &name;
-+ break;
-+ }
-
- /* For each matched element, add it to the list. */
- while (i-- > 0)
-@@ -3174,7 +3183,8 @@
- #endif /* !NO_ARCHIVES */
- NEWELT (concat (2, prefix, nlist[i]));
-
-- globfree (&gl);
-+ if (globme)
-+ globfree (&gl);
-
- #ifndef NO_ARCHIVES
- if (arname)
-Index: tests/scripts/functions/wildcard
-===================================================================
-RCS file: /sources/make/make/tests/scripts/functions/wildcard,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -r1.6 -r1.7
---- tests/scripts/functions/wildcard 13 Jun 2009 21:21:49 -0000 1.6
-+++ tests/scripts/functions/wildcard 7 May 2011 14:36:11 -0000 1.7
-@@ -88,4 +88,16 @@
- !,
- '', "\n");
-
-+# TEST #5: wildcard used to verify file existence
-+
-+touch('xxx.yyy');
-+
-+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
-+ '', "file=xxx.yyy\n");
-+
-+unlink('xxx.yyy');
-+
-+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
-+ '', "file=\n");
-+
- 1;
diff --git a/abs/core/make/make-3.82-makeflags.patch b/abs/core/make/make-3.82-makeflags.patch
deleted file mode 100644
index 3cba3c4..0000000
--- a/abs/core/make/make-3.82-makeflags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: main.c
-===================================================================
-RCS file: /sources/make/make/main.c,v
-retrieving revision 1.246
-diff -u -r1.246 main.c
---- main.c 29 Aug 2010 23:05:27 -0000 1.246
-+++ main.c 27 Jul 2011 22:03:12 -0000
-@@ -2091,10 +2095,16 @@
-
- /* Reset makeflags in case they were changed. */
- {
-+ if (master_job_slots)
-+ {
-+ assert (job_slots == default_job_slots);
-+ job_slots = master_job_slots;
-+ }
- const char *pv = define_makeflags (1, 1);
- char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
- sprintf (p, "MAKEFLAGS=%s", pv);
- putenv (allocated_variable_expand (p));
-+ job_slots = default_job_slots;
- }
-
- if (ISDB (DB_BASIC))
-@@ -2825,9 +2852,11 @@
- && (*(unsigned int *) cs->value_ptr ==
- *(unsigned int *) cs->noarg_value))
- ADD_FLAG ("", 0); /* Optional value omitted; see below. */
-+#if 0
- else if (cs->c == 'j')
- /* Special case for `-j'. */
- ADD_FLAG ("1", 1);
-+#endif
- else
- {
- char *buf = alloca (30);
diff --git a/abs/core/make/make-3.82-sort-blank.patch b/abs/core/make/make-3.82-sort-blank.patch
deleted file mode 100644
index 2e73f5b..0000000
--- a/abs/core/make/make-3.82-sort-blank.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urp make-3.82/function.c make-3.82-pm/function.c
---- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200
-+++ make-3.82-pm/function.c 2010-10-27 01:43:27.000000000 +0200
-@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c
- {
- char c = *(t++);
-
-- if (! isspace ((unsigned char)c))
-+ if (! isblank ((unsigned char)c))
- continue;
-
- ++wordi;
-
-- while (isspace ((unsigned char)*t))
-+ while (isblank ((unsigned char)*t))
- ++t;
- }
diff --git a/abs/core/make/make.install b/abs/core/make/make.install
deleted file mode 100644
index 8426085..0000000
--- a/abs/core/make/make.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(make.info make.info-1 make.info-2)
-
-post_install() {
- [[ -x usr/bin/install-info ]] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [[ -x usr/bin/install-info ]] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
--
cgit v0.12
From 5cff5de5042ab11e00e08bf56e27dca2dbe42b10 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 14 Nov 2016 22:16:13 +0000
Subject: man-pages: update to 4.08
---
abs/core/man-pages/PKGBUILD | 32 ++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 10 deletions(-)
diff --git a/abs/core/man-pages/PKGBUILD b/abs/core/man-pages/PKGBUILD
index c4c6ab8..baa2eba 100644
--- a/abs/core/man-pages/PKGBUILD
+++ b/abs/core/man-pages/PKGBUILD
@@ -1,20 +1,24 @@
-# $Id: PKGBUILD 158918 2012-05-13 07:19:23Z andyrtr $
+# $Id$
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=man-pages
-pkgver=3.41
-_posixver=2003-a
+pkgver=4.08
+_posixver=2013-a
pkgrel=1
pkgdesc="Linux man pages"
arch=('any')
-license=('GPL')
+license=('GPL' 'custom')
url="http://man7.org/linux/man-pages/index.html"
groups=('base')
depends=()
-source=(http://www.kernel.org/pub/linux/docs/man-pages/$pkgname-$pkgver.tar.xz
- http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/$pkgname-posix-${_posixver}.tar.bz2)
-md5sums=('7395d284fa1b9e112006d736865781b0'
- '7c78aff03c0a6767ba483d34f19e4b09')
+source=(http://www.kernel.org/pub/linux/docs/man-pages/$pkgname-$pkgver.tar.{xz,sign}
+ http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/$pkgname-posix-${_posixver}.tar.{xz,sign})
+# https://www.kernel.org/pub/linux/docs/man-pages/sha256sums.asc
+sha256sums=('2c6e7db4d76014dc21b1068df372f325e863318c32056369eca2f169519c62b4'
+ 'SKIP'
+ '19633a5c75ff7deab35b1d2c3d5b7748e7bd4ef4ab598b647bb7e7f60b90a808'
+ 'SKIP')
+validpgpkeys=('E522595B52EDA4E6BFCCCB5E856199113A35CE5E') #Michael Kerrisk (Linux man-pages maintainer) <mtk.manpages@gmail.com>
build() {
cd ${srcdir}/$pkgname-$pkgver
@@ -31,9 +35,13 @@ package() {
cd ${srcdir}/$pkgname-$pkgver
make prefix=${pkgdir}/usr install
-
+
+ # posix pages have a custom license
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 ${srcdir}/$pkgname-posix-${_posixver}/POSIX-COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/POSIX-COPYRIGHT"
+
cd ${pkgdir}/usr/share/man
- # these are included in coreutils || return 1
+ # these are included in coreutils
rm -f man1/{chgrp,chmod,chown,cp,dir,dd}.1
rm -f man1/{df,dircolors,du,install,ln,ls}.1
rm -f man1/{mkdir,mkfifo,mknod,mv,rm,rmdir}.1
@@ -45,4 +53,8 @@ package() {
rm -f man1/diff.1
# this is included in xf86-input-mouse
rm -f man4/mouse.4
+ # this is included in attr
+ rm -f man5/attr.5
+ # this is included in lirc
+ rm -f man4/lirc.4
}
--
cgit v0.12
From 37f15d10be0e5bf7be918f12c98eedeae1c7f076 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 15 Nov 2016 13:52:27 +0000
Subject: xfsprogs: update to 4.8.0
---
abs/core/xfsprogs/PKGBUILD | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/abs/core/xfsprogs/PKGBUILD b/abs/core/xfsprogs/PKGBUILD
index 09f2700..fe9196b 100644
--- a/abs/core/xfsprogs/PKGBUILD
+++ b/abs/core/xfsprogs/PKGBUILD
@@ -1,7 +1,7 @@
# $Id$
#
pkgname=xfsprogs
-pkgver=4.3.0
+pkgver=4.8.0
pkgrel=1
pkgdesc="XFS filesystem utilities"
arch=('i686' 'x86_64')
@@ -11,11 +11,11 @@ groups=('base')
depends=('libutil-linux')
makedepends=('git')
options=('!makeflags')
-source=("git://oss.sgi.com/xfs/cmds/xfsprogs#tag=v${pkgver}")
+source=("git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git#tag=v${pkgver}")
md5sums=('SKIP')
build() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/${pkgname}-dev"
make configure
export OPTIMIZER="-march=${CARCH/_/-} -O1"
export DEBUG=-DNDEBUG
@@ -24,7 +24,7 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/${pkgname}-dev"
make DIST_ROOT="${pkgdir}" PKG_ROOT_SBIN_DIR="/usr/bin" install install-dev
chown -R root $pkgdir
chgrp -R root $pkgdir
--
cgit v0.12
From b74188cc7faea8353d277f072bd3396185859849 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Nov 2016 15:01:43 +0000
Subject: xf86-video-intel: update to 2.99.917+730
---
abs/core/xf86-video-intel/PKGBUILD | 8 +++++---
abs/core/xf86-video-intel/xf86-video-intel.install | 23 +++++++++++-----------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/abs/core/xf86-video-intel/PKGBUILD b/abs/core/xf86-video-intel/PKGBUILD
index fd7d99f..51dd19a 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=a508b11 # 7 digits
-pkgver=2.99.917+654+g${_commit}
+_commit=dad64e9 # 7 digits
+pkgver=2.99.917+730+gdad64e9
pkgrel=1
epoch=1
arch=(i686 x86_64)
@@ -44,7 +44,9 @@ prepare() {
build() {
cd $pkgname
- ./configure --prefix=/usr --libexecdir=/usr/lib
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --with-default-dri=3
make
}
diff --git a/abs/core/xf86-video-intel/xf86-video-intel.install b/abs/core/xf86-video-intel/xf86-video-intel.install
index 213f7d4..1d31abe 100644
--- a/abs/core/xf86-video-intel/xf86-video-intel.install
+++ b/abs/core/xf86-video-intel/xf86-video-intel.install
@@ -1,20 +1,21 @@
-post_upgrade() {
- if (( $(vercmp $2 2.21.15) < 0 )); then
- post_install
- fi
-}
-
post_install() {
cat <<MSG
->>> This driver uses SNA as the default acceleration method. You can try
- falling back to UXA if you run into trouble. To do so, save a file with
- the following content as /etc/X11/xorg.conf.d/20-intel.conf :
+>>> This driver now uses DRI3 as the default Direct Rendering
+ Infrastructure. You can try falling back to DRI2 if you run
+ into trouble. To do so, save a file with the following
+ content as /etc/X11/xorg.conf.d/20-intel.conf :
Section "Device"
Identifier "Intel Graphics"
Driver "intel"
- Option "AccelMethod" "uxa"
- #Option "AccelMethod" "sna"
+ Option "DRI" "2" # DRI3 is now default
+ #Option "AccelMethod" "sna" # default
+ #Option "AccelMethod" "uxa" # fallback
EndSection
MSG
}
+post_upgrade() {
+ if (( $(vercmp $2 1:2.99.917+684+g6988b87-3) < 0 )); then
+ post_install
+ fi
+}
--
cgit v0.12
From 4d008e4d01b92648be9b6f4621e6f3e7e143f0c1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Nov 2016 15:07:54 +0000
Subject: libva: update to 1.7.3
---
abs/extra/libva/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/extra/libva/PKGBUILD b/abs/extra/libva/PKGBUILD
index 1873cec..2d6d0e1 100644
--- a/abs/extra/libva/PKGBUILD
+++ b/abs/extra/libva/PKGBUILD
@@ -3,7 +3,7 @@
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
pkgname=libva
-pkgver=1.6.1
+pkgver=1.7.3
pkgrel=1
pkgdesc='Video Acceleration (VA) API for Linux'
arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('libgl' 'libdrm' 'libxfixes')
makedepends=('mesa')
optdepends=('libva-vdpau-driver: backend for Nvidia and AMD cards'
'libva-intel-driver: backend for Intel cards')
-source=(http://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('7a5eb1fdf531f987211b7228a6a46428')
+source=(https://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha1sums=('18e46f3d5a0e971eb0ec9fe14bc021e69eb13fb8')
build() {
cd $pkgname-$pkgver
--
cgit v0.12
From 996114d907913275adfa89c6d39e4922a71a84a1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Nov 2016 15:47:07 +0000
Subject: libva-intel-driver: update to 1.7.3
---
abs/extra/libva-intel-driver/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/extra/libva-intel-driver/PKGBUILD b/abs/extra/libva-intel-driver/PKGBUILD
index f3ab7b9..1166e5e 100644
--- a/abs/extra/libva-intel-driver/PKGBUILD
+++ b/abs/extra/libva-intel-driver/PKGBUILD
@@ -3,7 +3,7 @@
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
pkgname=libva-intel-driver
-pkgver=1.6.1
+pkgver=1.7.3
pkgrel=1
pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ url='http://freedesktop.org/wiki/Software/vaapi'
license=('MIT')
depends=('libva')
replaces=('libva-driver-intel')
-source=(http://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('ed1b04c1a3c029ad389b7e23822a2762')
+source=(https://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha1sums=('5100f187afc4e39fce5664b96fe11a38faa9afaa')
prepare() {
cd $pkgname-$pkgver
--
cgit v0.12
From fa7590f6b0b9e62d21198dd326766ac8c91d7c2e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Nov 2016 17:56:02 +0000
Subject: mythtv & mythplugins: update to latest fixes
---
abs/core/mythtv/stable-0.28/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.28/mythtv/PKGBUILD | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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 abc71d9..ace800a 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 @@
-1434df8592ad6bf1eae4fd2eb46955e0adedc8aa
+2131fb291c49fc62cf8ac0c1b26c89193d2436dc
diff --git a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
index 18159aa..d161477 100644
--- a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.28
-pkgrel=24
+pkgrel=25
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
diff --git a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD
index bf84d4c..5fb2f90 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=24
+pkgrel=25
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
--
cgit v0.12
From 13c6d348f6589990174d3d576e9d848d515fa5b7 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Nov 2016 19:30:37 +0000
Subject: linhes-theme: update osd.xml
---
abs/core/linhes-theme/PKGBUILD | 5 +-
abs/core/linhes-theme/osd.xml.patch | 213 +++++++++++++++++++++++++++++++-----
2 files changed, 186 insertions(+), 32 deletions(-)
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 7660af9..3cce956 100755
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-theme
pkgver=8.4
-pkgrel=10
+pkgrel=11
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -60,6 +60,7 @@ package() {
rsync -pL $srcdir/progdetails_page1.html $pkgdir/$THEMEROOT/LinHES/htmls/
rsync -pL $srcdir/progdetails_page1.html $pkgdir/$THEMEROOT/LinHES/htmls/progdetails_page2.html
rm -r $pkgdir/$THEMEROOT/LinHES/images/backgrounds/*
+ rm -r $pkgdir/$THEMEROOT/LinHES/osd.xml.alt
rsync -pL $srcdir/bubble_background.png $pkgdir/$THEMEROOT/LinHES/images/backgrounds/background.png
rsync -pL $srcdir/blank_coverart.png $pkgdir/$THEMEROOT/LinHES/images/
rsync -pL $srcdir/checkmark.png $pkgdir/$THEMEROOT/LinHES/images/
@@ -94,7 +95,7 @@ package() {
sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
}
md5sums=('2dca856c2a4d1f959473512c94e43b60'
- '0383edbb16b0d15f47492cde738f164b'
+ '37482d0332e1efb31433cc9e6f451565'
'f2b9c85519e80843294315a42870e582'
'43b1f213fd392fb07aac503e775e27bc'
'80bb72994eca59ca6dc9034ac185e7cc'
diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch
index d4b225b..3ad39d1 100644
--- a/abs/core/linhes-theme/osd.xml.patch
+++ b/abs/core/linhes-theme/osd.xml.patch
@@ -1,5 +1,5 @@
---- osd.xml.orig 2016-10-25 18:54:13.696402426 +0000
-+++ osd.xml 2016-10-25 18:53:00.649172353 +0000
+--- osd.xml.orig 2016-11-16 18:00:59.736588734 +0000
++++ osd.xml 2016-11-16 19:17:20.803037116 +0000
@@ -7,13 +7,13 @@
<window name="osd_debug">
<area>0,0,1280,720</area>
@@ -264,17 +264,17 @@
- <area>90,658,1100,24</area>
+ <textarea name="value">
+ <area>90,657,1100,24</area>
-+ <font>small</font>
-+ <align>allcenter</align>
+ <font>small</font>
+ <align>allcenter</align>
+- <template>%DESCRIPTION%
+- %(|REMAININGTIME|)%%(|BEHINDTIME|)%%VALUE%%UNITS%</template>
+ <template>%VALUE%%UNITS%</template>
+ </textarea>
+
+ <textarea name="playedtime" depends="!value">
+ <area>90,657,1100,24</area>
- <font>small</font>
- <align>allcenter</align>
-- <template>%DESCRIPTION%
-- %(|REMAININGTIME|)%%(|BEHINDTIME|)%%VALUE%%UNITS%</template>
++ <font>small</font>
++ <align>allcenter</align>
+ <template>%PLAYEDTIME% of %TOTALTIME%
+ %(|REMAININGTIME| remains)%%(|BEHINDTIME| behind)%</template>
</textarea>
@@ -291,7 +291,8 @@
+ <pixelsize>23</pixelsize>
</fontdef>
- <fontdef name="supersmall" from="small">
+- <fontdef name="supersmall" from="small">
++ <fontdef name="supersmall" from="small">
<weight>bold</weight>
- <pixelsize>12</pixelsize>
+ <pixelsize>14</pixelsize>
@@ -330,6 +331,60 @@
</fontdef>
<shape name="program-info-backdrop">
+@@ -628,7 +623,7 @@
+ <font>supersmallblue</font>
+ <cutdown>no</cutdown>
+ <align>allcenter</align>
+- <value>WatchingLiveTM</value>
++ <value>WatchingLiveTV</value>
+ </textarea>
+ </state>
+ <state name="WatchingPreRecorded">
+@@ -685,7 +680,7 @@
+ <font>supersmallblue</font>
+ <cutdown>no</cutdown>
+ <align>allcenter</align>
+- <value>AudioCodec: PCM_DVD</value>
++ <value>AudioCodec: PCM DVD</value>
+ </textarea>
+ </state>
+ <state name="PCM_BLURAY">
+@@ -787,7 +782,7 @@
+ <font>supersmallblue</font>
+ <cutdown>no</cutdown>
+ <align>allcenter</align>
+- <value>Audio: Mono</value>
++ <value>AudioChannels: Mono</value>
+ </textarea>
+ </state>
+ <state name="2">
+@@ -805,7 +800,7 @@
+ <font>supersmallblue</font>
+ <cutdown>no</cutdown>
+ <align>allcenter</align>
+- <value>Audio: 5 CH.</value>
++ <value>AudioChannels: 5.0</value>
+ </textarea>
+ </state>
+ <state name="6">
+@@ -823,7 +818,7 @@
+ <font>supersmallblue</font>
+ <cutdown>no</cutdown>
+ <align>allcenter</align>
+- <value>Audio: 7 CH.</value>
++ <value>AudioChannels: 7.0</value>
+ </textarea>
+ </state>
+ <state name="8">
+@@ -832,7 +827,7 @@
+ <font>supersmallblue</font>
+ <cutdown>no</cutdown>
+ <align>allcenter</align>
+- <value>Audio: 7.1 CH.</value>
++ <value>AudioChannels: 7.1</value>
+ </textarea>
+ </state>
+ </statetype>
@@ -865,6 +860,15 @@
<value>VideoCodec: H.264</value>
</textarea>
@@ -346,34 +401,129 @@
<state name="MPEG-4">
<textarea name="MPEG-4">
<area>830,432,180,16</area>
-@@ -988,7 +992,7 @@
+@@ -910,7 +914,7 @@
+ <font>supersmallblue</font>
+ <cutdown>no</cutdown>
+ <align>allcenter</align>
+- <value>VideoDesc: SD</value>
++ <value>VideoRes: SD</value>
+ </textarea>
+ </state>
+ <state name="HD_720_P">
+@@ -919,7 +923,7 @@
+ <font>supersmallblue</font>
+ <cutdown>no</cutdown>
+ <align>allcenter</align>
+- <value>VideoDesc: HD_720_P</value>
++ <value>VideoRes: HD 720p</value>
+ </textarea>
+ </state>
+ <state name="HD_1080_I">
+@@ -928,7 +932,7 @@
+ <font>supersmallblue</font>
+ <cutdown>no</cutdown>
+ <align>allcenter</align>
+- <value>VideoDesc: HD_1080_I</value>
++ <value>VideoRes: HD 1080i</value>
+ </textarea>
+ </state>
+ <state name="HD_1080_P">
+@@ -937,23 +941,32 @@
+ <font>supersmallblue</font>
+ <cutdown>no</cutdown>
+ <align>allcenter</align>
+- <value>VideoDesc: HD_1080_P</value>
++ <value>VideoRes: HD 1080p</value>
+ </textarea>
+ </state>
+ </statetype>
+
+- <textarea name="timedate">
++ <!--use channum to detect if in videos-->
++ <textarea name="timedate" depends="channum">
+ <font>mediumsmall</font>
+- <area>274,453,481,24</area>
++ <area>274,453,581,24</area>
+ <align>vcenter</align>
+- <template>%TIMEDATE% : %LENMINS%</template>
++ <template>%TIMEDATE% %LONGREPEAT%</template>
+ </textarea>
+
+- <textarea name="longrepeat">
++ <!--use channum to detect if in videos-->
++ <textarea name="lenminsFilesize" depends="channum">
+ <font>mediumsmall</font>
+- <area>771,453,435,22</area>
++ <area>871,453,335,22</area>
++ <align>right,vcenter</align>
++ <template>%LENMINS% (%FILESIZE_STR%)</template>
++ </textarea>
++
++ <!--use channum to detect if in videos-->
++ <textarea name="lenmins" depends="!channum">
++ <font>mediumsmall</font>
++ <area>871,453,335,22</area>
+ <align>right,vcenter</align>
+- <template>%LONGREPEAT% Size: %FILESIZE_STR%</template>
+ </textarea>
+
+ <imagetype name="coverart">
+@@ -988,13 +1001,22 @@
<alpha>255</alpha>
</imagetype>
- <textarea name="category">
-+ <textarea name="category">
++ <!--use channum to detect if in videos-->
++ <textarea name="category" depends="channum">
<font>supersmallblue</font>
<area>284,490,912,28</area>
<align>allcenter</align>
-@@ -1003,37 +1007,49 @@
+ <template>Category: %CATEGORY% PlayBackGroup: %PLAYGROUP% RecGroup: %RECORDINGGROUP% StorageGroup: %STORAGEGROUP%</template>
+ </textarea>
+
++ <!--use channum to detect if in videos-->
++ <textarea name="playback" depends="!channum">
++ <font>supersmallblue</font>
++ <area>284,490,912,28</area>
++ <align>allcenter</align>
++ <template>PlayBackGroup: %PLAYGROUP% RecGroup: %RECORDINGGROUP% StorageGroup: %STORAGEGROUP%</template>
++ </textarea>
++
+ <textarea name="description">
+ <font>small</font>
+ <area>284,523,912,126</area>
+@@ -1003,37 +1025,62 @@
<template>%"|SUBTITLE|" %%YEARSTARS| %%DESCRIPTION%</template>
</textarea>
- <textarea name="programid">
-+ <textarea name="programid" depends="iconpath&!coverart">
++ <textarea name="programid" depends="channum&!coverart">
<font>supersmallblue</font>
<area>284,653,912,27</area>
<align>allcenter</align>
<template>Season/Episode: %s00e00% ProgramID: %PROGRAMID% SeriesID: %SERIESID%</template>
</textarea>
-+ <textarea name="channame" depends="iconpath&coverart">
++ <textarea name="channame" depends="channum&coverart">
+ <font>supersmallblue</font>
+ <area>284,653,912,27</area>
+ <align>allcenter</align>
+ <template>Channel: %channum% - %channame% - %callsign% Season/Episode: %s00e00% ProgramID: %PROGRAMID% SeriesID: %SERIESID%</template>
+ </textarea>
+
++ <!--use channum to detect if in videos-->
++ <textarea name="s00e00" depends="!channum">
++ <font>supersmallblue</font>
++ <area>2284,653,912,27</area>
++ <align>allcenter</align>
++ </textarea>
++ <textarea name="seasoneps" depends="!channum&s00e00">
++ <font>supersmallblue</font>
++ <area>284,653,912,27</area>
++ <align>allcenter</align>
++ <template>Season/Episode: %s00e00%</template>
++ </textarea>
++
</window>
<window name="browse_info">
@@ -412,7 +562,7 @@
</fontdef>
<shape name="browse-info-backdrop">
-@@ -1084,7 +1100,7 @@
+@@ -1084,7 +1131,7 @@
</shape>
<shape name="title-backdrop-line">
@@ -421,7 +571,7 @@
<type>roundbox</type>
<fill color="#000000" alpha="0" />
<line color="#ffffff" alpha="45" width="2" />
-@@ -1092,11 +1108,11 @@
+@@ -1092,11 +1139,11 @@
</shape>
<shape name="title-top-line" from="channel-top-line">
@@ -435,7 +585,7 @@
</shape>
<shape name="title-left-line" from="channel-left-line">
-@@ -1104,30 +1120,6 @@
+@@ -1104,30 +1151,6 @@
</shape>
<shape name="title-right-line" from="channel-left-line">
@@ -466,7 +616,7 @@
<area>1212,492,2,62</area>
</shape>
-@@ -1175,30 +1167,30 @@
+@@ -1175,30 +1198,29 @@
</textarea>
<textarea name="title">
@@ -478,19 +628,22 @@
<textarea name="timedate">
- <font>smallerblue</font>
+- <area>228,529,497,22</area>
+ <font>smaller</font>
- <area>228,529,497,22</area>
++ <area>228,529,843,22</area>
<align>vcenter</align>
- <template>%TIMEDATE% : %LENMINS%</template>
+- <template>%TIMEDATE% : %LENMINS%</template>
++ <template>%TIMEDATE% %LONGREPEAT%</template>
</textarea>
- <textarea name="longrepeat">
+- <textarea name="longrepeat">
- <font>smallerblue</font>
- <area>740,530,304,20</area>
++ <textarea name="lenmins">
+ <font>smaller</font>
-+ <area>902,530,310,20</area>
++ <area>1086,530,120,22</area>
<align>right,vcenter</align>
- <template>%LONGREPEAT%</template>
+- <template>%LONGREPEAT%</template>
</textarea>
<clock name="clock">
@@ -504,7 +657,7 @@
</clock>
<textarea name="description">
-@@ -1214,9 +1206,9 @@
+@@ -1214,9 +1236,9 @@
<window name="ChannelEditor">
<area>0,0,1280,720</area>
@@ -516,7 +669,7 @@
</fontdef>
<fontdef name="smallblack" from="small">
-@@ -1224,7 +1216,7 @@
+@@ -1224,7 +1246,7 @@
</fontdef>
<fontdef name="smallblue" from="small">
@@ -525,7 +678,7 @@
</fontdef>
<fontdef name="smallgrey" from="small">
-@@ -1232,7 +1224,7 @@
+@@ -1232,7 +1254,7 @@
</fontdef>
<fontdef name="medium" from="small">
@@ -534,7 +687,7 @@
</fontdef>
<shape name="channel-editor-backdrop">
-@@ -1610,9 +1602,9 @@
+@@ -1610,9 +1632,9 @@
<window name="osd_program_editor">
<area>0,0,1280,720</area>
@@ -546,7 +699,7 @@
</fontdef>
<shape name="osd-program-editor-backdrop">
-@@ -1663,13 +1655,17 @@
+@@ -1663,13 +1685,17 @@
</shape>
<textarea name="title">
@@ -567,7 +720,7 @@
<align>right,vcenter</align>
</textarea>
-@@ -1749,9 +1745,9 @@
+@@ -1749,9 +1775,9 @@
<window name="MythPopupBox">
<area>0,0,1280,720</area>
@@ -579,7 +732,7 @@
</fontdef>
<fontdef name="smallgrey" from="small">
-@@ -1759,7 +1755,7 @@
+@@ -1759,7 +1785,7 @@
</fontdef>
<fontdef name="smallyellow" from="small">
--
cgit v0.12
From 6892066c14d12d02513cbab921f5ee44d37fb5b1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Nov 2016 20:15:38 +0000
Subject: linhes-theme: update recordings and videos default text
---
abs/core/linhes-theme/PKGBUILD | 6 ++--
abs/core/linhes-theme/recordings-ui.xml.patch | 13 +++++++--
abs/core/linhes-theme/video-ui.xml.patch | 40 +++++++++++++++++++++++++--
3 files changed, 52 insertions(+), 7 deletions(-)
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 3cce956..2f3d083 100755
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-theme
pkgver=8.4
-pkgrel=11
+pkgrel=12
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -101,8 +101,8 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60'
'80bb72994eca59ca6dc9034ac185e7cc'
'22ff4044c8c29560451fb51dcbf4d44e'
'9fe3371a8b964a7028126405cfaa330b'
- 'e88dc1587a164aaa15b280cb66f6a82b'
- '59b43ab3c40390ad4184883a5e23a16a'
+ 'ca7efe27ec941e341a555451a48f42ed'
+ '0d62c91c3c1fe76a4549459741591312'
'5a8fb2a5f0e657d52be6f0a6a006ce72'
'35d77d91125e46728a30ab23d0903223'
'bfc32b9fa5dca3d46dd6f365ecb449b5'
diff --git a/abs/core/linhes-theme/recordings-ui.xml.patch b/abs/core/linhes-theme/recordings-ui.xml.patch
index 66f8875..4c8f8c1 100644
--- a/abs/core/linhes-theme/recordings-ui.xml.patch
+++ b/abs/core/linhes-theme/recordings-ui.xml.patch
@@ -1,5 +1,5 @@
---- recordings-ui.xml.orig 2016-01-13 18:49:43.937377460 +0000
-+++ recordings-ui.xml 2016-02-01 17:30:34.022038184 +0000
+--- recordings-ui.xml.orig 2016-11-16 20:12:29.390254787 +0000
++++ recordings-ui.xml 2016-11-16 20:12:03.436933524 +0000
@@ -105,19 +105,11 @@
</shape>
@@ -138,3 +138,12 @@
<font>basesupersmallyellow</font>
<align>allcenter</align>
<template>Disk space: %1</template>
+@@ -688,7 +673,7 @@
+ <textarea name="norecordings">
+ <area>350,87,906,351</area>
+ <font>basemedium</font>
+- <value>No Recordings available, or screen loading...</value>
++ <value>No recordings available.</value>
+ <multiline>yes</multiline>
+ <align>allcenter</align>
+ </textarea>
diff --git a/abs/core/linhes-theme/video-ui.xml.patch b/abs/core/linhes-theme/video-ui.xml.patch
index 5a84e64..0047776 100644
--- a/abs/core/linhes-theme/video-ui.xml.patch
+++ b/abs/core/linhes-theme/video-ui.xml.patch
@@ -1,5 +1,5 @@
---- video-ui.xml.orig 2016-01-13 18:49:34.555245775 +0000
-+++ video-ui.xml 2016-04-13 19:49:28.563719931 +0000
+--- video-ui.xml.orig 2016-11-16 20:12:36.859292023 +0000
++++ video-ui.xml 2016-11-16 20:11:55.327978776 +0000
@@ -171,6 +171,7 @@
<textarea name="description" from="basetextarea">
<area>24,51,515,393</area>
@@ -8,6 +8,15 @@
<font>basesmall</font>
</textarea>
+@@ -641,7 +642,7 @@
+ <multiline>yes</multiline>
+ <font>basesmall</font>
+ <align>allcenter</align>
+- <value>No videos in library, or no files found. If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Change."</value>
++ <value>No videos available. If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
+ </textarea>
+
+ <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
@@ -876,13 +877,6 @@
<align>left,vcenter</align>
</textarea>
@@ -380,6 +389,15 @@
<cutdown>no</cutdown>
<align>allcenter</align>
</textarea>
+@@ -1131,7 +1160,7 @@
+ <multiline>yes</multiline>
+ <font>basesmall</font>
+ <align>allcenter</align>
+- <value>No videos in library, or no files found. If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
++ <value>No videos available. If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
+ </textarea>
+
+ <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
@@ -1369,14 +1398,14 @@
<font>basemediumlargeryellow</font>
<align>left,vcenter</align>
@@ -755,6 +773,15 @@
<cutdown>no</cutdown>
<align>allcenter</align>
</textarea>
+@@ -1625,7 +1689,7 @@
+ <multiline>yes</multiline>
+ <font>basesmall</font>
+ <align>allcenter</align>
+- <value>No videos in library, or no files found. If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
++ <value>No videos available. If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
+ </textarea>
+
+ <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
@@ -1798,21 +1862,21 @@
<textarea name="title" from="basetextarea">
@@ -1089,6 +1116,15 @@
<cutdown>no</cutdown>
<align>allcenter</align>
</textarea>
+@@ -2120,7 +2184,7 @@
+ <multiline>yes</multiline>
+ <font>basesmall</font>
+ <align>allcenter</align>
+- <value>No videos in library, or no files found. If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Change."</value>
++ <value>No videos available. If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
+ </textarea>
+
+ <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
@@ -2947,82 +3011,84 @@
<multiline>no</multiline>
<font>basesmalldarkyellow</font>
--
cgit v0.12
From c0b308515aa15463cc177ad500f3817487b954ca Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 17 Nov 2016 19:33:06 +0000
Subject: linhes-theme: update osd.xml
---
abs/core/linhes-theme/PKGBUILD | 4 ++--
abs/core/linhes-theme/osd.xml.patch | 16 +++++++++++++---
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 2f3d083..b30b086 100755
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-theme
pkgver=8.4
-pkgrel=12
+pkgrel=13
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -95,7 +95,7 @@ package() {
sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
}
md5sums=('2dca856c2a4d1f959473512c94e43b60'
- '37482d0332e1efb31433cc9e6f451565'
+ '196b4d6691e95b87a76a9ed8be31a3d9'
'f2b9c85519e80843294315a42870e582'
'43b1f213fd392fb07aac503e775e27bc'
'80bb72994eca59ca6dc9034ac185e7cc'
diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch
index 3ad39d1..3eabbfc 100644
--- a/abs/core/linhes-theme/osd.xml.patch
+++ b/abs/core/linhes-theme/osd.xml.patch
@@ -1,5 +1,5 @@
--- osd.xml.orig 2016-11-16 18:00:59.736588734 +0000
-+++ osd.xml 2016-11-16 19:17:20.803037116 +0000
++++ osd.xml 2016-11-17 19:29:17.370920531 +0000
@@ -7,13 +7,13 @@
<window name="osd_debug">
<area>0,0,1280,720</area>
@@ -185,7 +185,12 @@
<area>875,101,100,25</area>
<align>left,vcenter</align>
</textarea>
-@@ -203,7 +191,7 @@
+@@ -199,11 +187,11 @@
+ <font>medium</font>
+ <area>670,126,200,25</area>
+ <align>right,vcenter</align>
+- <value>Frames decoded/free :</value>
++ <value>Frames Decoded/Free :</value>
</textarea>
<textarea name="videoframes">
@@ -212,7 +217,12 @@
<area>1129,101,77,25</area>
<align>left,vcenter</align>
</textarea>
-@@ -242,7 +230,7 @@
+@@ -238,11 +226,11 @@
+ <font>medium</font>
+ <area>994,126,130,25</area>
+ <align>right,vcenter</align>
+- <value>Sample rate :</value>
++ <value>Sample Rate :</value>
</textarea>
<textarea name="samplerate">
--
cgit v0.12
From 27a16f8e37094aeea9d72ad02aeb0a9f4ff28aec Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 17 Nov 2016 19:34:46 +0000
Subject: LinHES-config: LinHES-release update for R8.4.2
---
abs/core/LinHES-config/LinHES-release | 2 +-
abs/core/LinHES-config/PKGBUILD | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/LinHES-config/LinHES-release b/abs/core/LinHES-config/LinHES-release
index 28b8a70..4d73023 100644
--- a/abs/core/LinHES-config/LinHES-release
+++ b/abs/core/LinHES-config/LinHES-release
@@ -1 +1 @@
-LinHES R8.4.1 (Breaking Ground)
+LinHES R8.4.2 (Breaking Ground)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index b5852c5..ed6cca9 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=LinHES-config
-pkgver=8.4.1
+pkgver=8.4.2
pkgrel=1
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
@@ -152,7 +152,7 @@ md5sums=('97b810ddc35d1f441dbe8cdd6886e2af'
'f0376c98a7986897406d393186c0365e'
'157e73d0f90d7b306aba8f5921aeedd3'
'1f58c0393a131f4a8f9a84b3fe08a7e4'
- 'b6044c77a5ef1b0e8f49dafda852cebe'
+ '5c9fcb4cf5fb736df89ad60ca2e694f3'
'5f890ea9bda6aef652d2560ca19dac07'
'ab2aa42c2947148c2b1cac0ade6d1d55'
'd429b59d3cfb37b0624c6a4a71a7c2c0'
--
cgit v0.12