diff options
| author | Britney Fransen <brfransen@gmail.com> | 2023-03-26 21:36:14 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2023-03-26 21:36:14 (GMT) |
| commit | 82a36ce614124a8086338065333a7adc9fc32de2 (patch) | |
| tree | 366e1da832c353c7078671962da322ca12b8aab1 /linhes/mythtv | |
| parent | 8b52500c1099893957e0bb2f937e272f9bcd2007 (diff) | |
| download | linhes_pkgbuild-82a36ce614124a8086338065333a7adc9fc32de2.zip linhes_pkgbuild-82a36ce614124a8086338065333a7adc9fc32de2.tar.gz linhes_pkgbuild-82a36ce614124a8086338065333a7adc9fc32de2.tar.bz2 | |
mythtv: remove time value patch; merged upstream
Diffstat (limited to 'linhes/mythtv')
| -rw-r--r-- | linhes/mythtv/PKGBUILD | 7 | ||||
| -rw-r--r-- | linhes/mythtv/negative_time_values.patch | 25 |
2 files changed, 3 insertions, 29 deletions
diff --git a/linhes/mythtv/PKGBUILD b/linhes/mythtv/PKGBUILD index d23e545..640eed5 100644 --- a/linhes/mythtv/PKGBUILD +++ b/linhes/mythtv/PKGBUILD @@ -7,8 +7,8 @@ # Contributor: dorphell <dorphell@archlinux.org> pkgname=mythtv -pkgver=33+fixes.20230313.7f288be6 -pkgrel=3 +pkgver=33+fixes.20230324.b391cfb6 +pkgrel=1 pkgdesc="A Homebrew PVR project" arch=('x86_64') url="https://www.mythtv.org/" @@ -86,7 +86,6 @@ patches="0031-UPnP-Reduce-startup-latency-by-moving-blocking-code-to-own-thread. 0227-OSD-Add-interlaced-status-to-OSD-debug-screen.patch autoskip_reduce_commskip_jumpback.patch defaultThemeLinHES.patch - negative_time_values.patch mythfrontend_en_us.ts_Title_Case.patch" source=( @@ -111,7 +110,6 @@ sha256sums=('SKIP' '630c80c588a9b278c4421d356c5cbaa0debf149524bc896656b580b89d8fae88' '8a81e724d902976056dc824e7304df343c230ce67ec6ce1d18e110c5ef818ef6' 'ef1d0053d862a9c714093d375e20c96418d665fa504a5b8f30621a271d416dd8' - 'c1e1b2bca9c3f4d5f862d44ae45bba484b5b4afd3030a2ddbb0c8c5efc4c68da' '6c6047d676635375f44fd219b989ed99602ed3260a8a5757195831dcc8a7c1bc') prepare() { @@ -157,6 +155,7 @@ CFLAGS="-march=x86-64 -mtune=amdfam10 -O2 -pipe -fno-plt -fexceptions \ --disable-altivec \ --disable-audio-jack \ --disable-distcc \ + --enable-libdav1d \ --enable-libmp3lame \ --enable-libvpx \ --enable-libx264 \ diff --git a/linhes/mythtv/negative_time_values.patch b/linhes/mythtv/negative_time_values.patch deleted file mode 100644 index 7e15d19..0000000 --- a/linhes/mythtv/negative_time_values.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/mythtv/libs/libmythbase/mythdate.cpp b/mythtv/libs/libmythbase/mythdate.cpp -index 8f3397241a6..21a307cb453 100644 ---- a/mythtv/libs/libmythbase/mythdate.cpp -+++ b/mythtv/libs/libmythbase/mythdate.cpp -@@ -237,6 +237,9 @@ QString formatTime(std::chrono::milliseconds msecs, QString fmt) - static const QRegularExpression sRe("s+"); - static const QRegularExpression zRe("z+"); - -+ bool negativeTime = msecs < 0ms; -+ msecs = std::chrono::milliseconds(std::abs(msecs.count())); -+ - QRegularExpressionMatch match = hRe.match(fmt); - if (match.hasMatch()) - { -@@ -272,6 +275,10 @@ QString formatTime(std::chrono::milliseconds msecs, QString fmt) - QString text = StringUtil::intToPaddedString(value, width); - fmt.replace(match.capturedStart(), match.capturedLength(), text); - } -+ -+ if (negativeTime) -+ fmt.prepend("-"); -+ - return fmt; - } - |