Chakra_Linux/desktop
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/desktop.git synced 2025-02-10 10:24:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

kaffeine: rebuild for sound group update

Browse Source
This commit is contained in:
Neophytos 2013-11-17 00:01:09 +00:00
parent 69251a9b97
commit da92787aad
2 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kaffeine/PKGBUILD
View File

@ -1,23 +1,27 @@
#
# Apps Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
# Contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/kaffeine
pkgname=kaffeine
pkgver=1.2.2
pkgrel=2
pkgrel=3
pkgdesc='KDE media player'
license=('GPL')
arch=('i686' 'x86_64')
arch=('x86_64')
url="http://kaffeine.kde.org"
depends=('kdelibs' 'kdebase-runtime' 'xine-lib')
depends=('kde-runtime' 'xine-lib')
makedepends=('pkg-config' 'cmake' 'automoc4')
categories=('multimedia')
install=kaffeine.install
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
md5sums=('690e48d2e5fe123887109aa9b1bc1c31')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
'dvbfix.patch')
md5sums=('690e48d2e5fe123887109aa9b1bc1c31'
'f82890d4164d29fae518268165f06960')
prepare() {
cd ${pkgname}-${pkgver}
patch -p1 -i "${srcdir}/dvbfix.patch"
}
build() {
cd "$srcdir"
mkdir -p build

32
kaffeine/dvbfix.patch Normal file
View File

@ -0,0 +1,32 @@
commit 2da9df1e67004c3cfa879578c351300a99f23da1
Author: Christoph Pfister <christophpfister@gmail.com>
Date: Wed Apr 4 21:22:09 2012 +0200
fix build for gcc 4.7
diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
index 7fc8f68..e70d8b8 100644
--- a/src/dvb/dvbepg.cpp
+++ b/src/dvb/dvbepg.cpp
@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size)
// 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
- --entryCount, entry.advance()) {
+ for (AtscEitSectionEntry eitEntry = eitSection.entries();
+ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
DvbEpgEntry epgEntry;
epgEntry.channel = channel;
- epgEntry.begin = baseDateTime.addSecs(entry.startTime());
- epgEntry.duration = QTime().addSecs(entry.duration());
- epgEntry.title = entry.title();
+ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
+ epgEntry.duration = QTime().addSecs(eitEntry.duration());
+ epgEntry.title = eitEntry.title();
- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
+ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId()));
DvbSharedEpgEntry entry = epgEntries.value(id);
if (entry.isValid() && (entry->channel == epgEntry.channel) &&