update to kaffeine 0.8.2

This commit is contained in:
espie 2006-10-29 23:36:39 +00:00
parent cb000b8d06
commit 010aa243e7
6 changed files with 63 additions and 37 deletions

View File

@ -1,18 +1,18 @@
# $OpenBSD: Makefile,v 1.3 2006/08/11 13:28:55 steven Exp $
# $OpenBSD: Makefile,v 1.4 2006/10/29 23:36:39 espie Exp $
CATEGORIES= multimedia x11 x11/kde
COMMENT= 'video player for kde'
HOMEPAGE= http://kaffeine.sourceforge.net/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kaffeine/}
DISTNAME= kaffeine-0.8.1
PKGNAME= ${DISTNAME}p0
DISTNAME= kaffeine-0.8.2
PKGNAME= ${DISTNAME}
EXTRACT_SUFX= .tar.bz2
SHARED_ONLY= Yes
SHARED_LIBS= kaffeineaudioencoder 0.0 \
kmediapart 0.0
SHARED_LIBS += kaffeinepart 0.0 # .0.1
SHARED_LIBS += kaffeineaudioencoder 0.0 # .0.1
MODULES= x11/kde
USE_LIBTOOL= Yes
@ -31,6 +31,7 @@ CONFIGURE_ENV+= ${MODKDE_CONFIGURE_ENV}
MAKE_ENV= ${CONFIGURE_ENV}
MAKE_FLAGS+= ${MODKDE_MAKE_FLAGS}
MAKE_FLAGS+= LIBRESOLV=
SEPARATE_BUILD= Yes
LIB_DEPENDS= kdecore.>=7,DCOP,kdesu,kio,kdefx,kparts,kutils,kdeprint,kdeui,kwalletclient,khtml,kjs::x11/kde/libs3 \
vorbis,vorbisenc::audio/libvorbis \

View File

@ -1,4 +1,4 @@
MD5 (kaffeine-0.8.1.tar.bz2) = 3abba4ff76ffdd109e1f1cfe286e5b5b
RMD160 (kaffeine-0.8.1.tar.bz2) = 0a8ec4980b5ddce55640543763ae22215a1c5287
SHA1 (kaffeine-0.8.1.tar.bz2) = b593fdc3afeee71eb60c2ac5b9c6e41057f5d12a
SIZE (kaffeine-0.8.1.tar.bz2) = 2703094
MD5 (kaffeine-0.8.2.tar.bz2) = bfb57b62fa72267cc5b01ce9b037cb41
RMD160 (kaffeine-0.8.2.tar.bz2) = d25e6b59ce2232d737837cd1a3967e0f04dea029
SHA1 (kaffeine-0.8.2.tar.bz2) = 8454655018ab7536c3104bff55b50d2ce972c406
SIZE (kaffeine-0.8.2.tar.bz2) = 2880225

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-kaffeine_src_input_disc_paranoia_cpp,v 1.1 2006/10/29 23:36:39 espie Exp $
--- kaffeine/src/input/disc/paranoia.cpp.orig Sun Oct 29 23:51:42 2006
+++ kaffeine/src/input/disc/paranoia.cpp Sun Oct 29 23:53:26 2006
@@ -16,7 +16,7 @@
#include <unistd.h>
#include <math.h>
-#include <endian.h>
+#include <sys/endian.h>
#include <qfile.h>
#include <qslider.h>

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-kaffeine_src_wizarddialog_cpp,v 1.1.1.1 2006/06/11 10:32:57 espie Exp $
--- kaffeine/src/wizarddialog.cpp.orig Sat Jun 10 13:48:17 2006
+++ kaffeine/src/wizarddialog.cpp Sat Jun 10 23:07:51 2006
@@ -104,7 +104,7 @@ WizardDialog::WizardDialog( QWidget *par
$OpenBSD: patch-kaffeine_src_instwizard_cpp,v 1.1 2006/10/29 23:36:39 espie Exp $
--- kaffeine/src/instwizard.cpp.orig Sat Sep 9 03:29:55 2006
+++ kaffeine/src/instwizard.cpp Mon Oct 30 00:02:20 2006
@@ -103,7 +103,7 @@ void InstWizard::internalWizard()
*/
//WIN32-CODECS
info << "<hr><b>" << i18n("WIN32 Codecs") << "...</b><br>";
@ -10,7 +10,7 @@ $OpenBSD: patch-kaffeine_src_wizarddialog_cpp,v 1.1.1.1 2006/06/11 10:32:57 espi
QStringList entries = d.entryList("wmv*");
if (entries.count())
info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
@@ -122,13 +122,13 @@ WizardDialog::WizardDialog( QWidget *par
@@ -121,13 +121,13 @@ void InstWizard::internalWizard()
else
{
d = QDir("/usr/local/lib");
@ -26,7 +26,7 @@ $OpenBSD: patch-kaffeine_src_wizarddialog_cpp,v 1.1.1.1 2006/06/11 10:32:57 espi
if (entries.count())
dvdcss = true;
}
@@ -139,6 +139,7 @@ WizardDialog::WizardDialog( QWidget *par
@@ -138,6 +138,7 @@ void InstWizard::internalWizard()
else
info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
@ -34,7 +34,7 @@ $OpenBSD: patch-kaffeine_src_wizarddialog_cpp,v 1.1.1.1 2006/06/11 10:32:57 espi
//DVD-DRIVE
info << "<br><hr><b>" << i18n("DVD Drive") << "...</b><br>";
KProcess process;
@@ -153,6 +154,7 @@ WizardDialog::WizardDialog( QWidget *par
@@ -152,6 +153,7 @@ void InstWizard::internalWizard()
else
info << "<font color=\"DarkBlue\">" << i18n("Can't check DMA mode. Permission denied or no such device:")
<< " \"/dev/dvd\".</font>";
@ -42,16 +42,10 @@ $OpenBSD: patch-kaffeine_src_wizarddialog_cpp,v 1.1.1.1 2006/06/11 10:32:57 espi
//DVB-DEVICES
#ifdef HAVE_LINUX_DVB_FRONTEND_H
@@ -281,9 +283,9 @@ void WizardDialog::accept()
void WizardDialog::slotReceivedStdout(KProcess*, char* buffer, int buflen)
@@ -270,5 +272,6 @@ void InstWizard::slotStdout(KProcess *,
{
- QString stdout = QString::fromLatin1(buffer, buflen);
- m_stdout.append(stdout);
- kdDebug() << "WizardDialog: got from hdparm: " << stdout << endl;
+ QString out = QString::fromLatin1(buffer, buflen);
+ m_stdout.append(out);
+ kdDebug() << "WizardDialog: got from hdparm: " << out << endl;
QString output = QString::fromLatin1(buffer, buflen);
kdDebug() << "WizardDialog: got from hdparm: " << output << "\n";
+#undef stdout
stdout.append(output);
}
void WizardDialog::reject()

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-kaffeine_src_instwizard_h,v 1.1 2006/10/29 23:36:39 espie Exp $
--- kaffeine/src/instwizard.h.orig Mon Oct 30 00:03:53 2006
+++ kaffeine/src/instwizard.h Mon Oct 30 00:04:01 2006
@@ -44,6 +44,7 @@ private:
void internalWizard();
+#undef stdout
QString stdout;
InstWizard(const InstWizard &);

View File

@ -1,25 +1,24 @@
@comment $OpenBSD: PLIST,v 1.2 2006/08/11 13:28:55 steven Exp $
@comment $OpenBSD: PLIST,v 1.3 2006/10/29 23:36:39 espie Exp $
bin/kaffeine
include/kaffeine/
include/kaffeine/kaffeine_part.h
include/kaffeine/kaffeine_part_iface.h
include/kaffeine/kaffeineaudioencoder.h
include/kaffeine/kmediapart.h
include/kaffeine/kaffeinepart.h
include/kaffeine/mrl.h
include/kaffeine/playlistimport.h
include/kaffeine/xine_part.h
include/kaffeine/xine_part_iface.h
include/kaffeine_export.h
${KDE}/libkaffeineoggvorbis.la
${KDE}/libkaffeineoggvorbis.so
${KDE}/libkaffeinepart.la
${KDE}/libkaffeinepart.so
${KDE}/libxinepart.la
${KDE}/libxinepart.so
lib/libkaffeineaudioencoder.la
@lib lib/libkaffeineaudioencoder.so.${LIBkaffeineaudioencoder_VERSION}
lib/libkmediapart.la
@lib lib/libkmediapart.so.${LIBkmediapart_VERSION}
lib/libkaffeinepart.la
@lib lib/libkaffeinepart.so.${LIBkaffeinepart_VERSION}
share/applications/kde/kaffeine.desktop
share/apps/kaffeine/
share/apps/kaffeine/dvbdata.tar.gz
share/apps/kaffeine/kaffeine_part.rc
share/apps/kaffeine/kaffeinedisc.rc
share/apps/kaffeine/kaffeineplaylist.rc
share/apps/kaffeine/kaffeineui.rc
@ -30,6 +29,7 @@ share/apps/kaffeine/nocover
share/apps/kaffeine/pics/
share/apps/kaffeine/pics/playing.png
share/apps/kaffeine/rtsp.protocol
share/apps/kaffeine/xine_part.rc
share/apps/konqueror/
share/apps/konqueror/servicemenus/
share/apps/konqueror/servicemenus/kaffeine_append_file.desktop
@ -69,6 +69,7 @@ share/icons/hicolor/16x16/mimetypes/mime_kaffeine.png
share/icons/hicolor/22x22/actions/player_mute.png
share/icons/hicolor/22x22/actions/player_record.png
share/icons/hicolor/22x22/apps/kaffeine.png
share/icons/hicolor/22x22/apps/kilogram.png
share/icons/hicolor/32x32/actions/player_mute.png
share/icons/hicolor/32x32/actions/player_record.png
share/icons/hicolor/32x32/apps/kaffeine-pause.png
@ -80,6 +81,7 @@ share/icons/hicolor/32x32/mimetypes/mime_kaffeine.png
share/icons/hicolor/48x48/apps/kaffeine.png
share/icons/hicolor/48x48/mimetypes/mime_kaffeine.png
share/icons/hicolor/64x64/apps/kaffeine.png
share/locale/ar/LC_MESSAGES/kaffeine.mo
share/locale/bg/LC_MESSAGES/kaffeine.mo
share/locale/bn/LC_MESSAGES/kaffeine.mo
share/locale/br/
@ -91,6 +93,7 @@ share/locale/da/LC_MESSAGES/kaffeine.mo
share/locale/de/LC_MESSAGES/kaffeine.mo
share/locale/el/LC_MESSAGES/kaffeine.mo
share/locale/es/LC_MESSAGES/kaffeine.mo
share/locale/et/LC_MESSAGES/kaffeine.mo
share/locale/fi/LC_MESSAGES/kaffeine.mo
share/locale/fr/LC_MESSAGES/kaffeine.mo
share/locale/ga/LC_MESSAGES/kaffeine.mo
@ -99,6 +102,10 @@ share/locale/he/LC_MESSAGES/kaffeine.mo
share/locale/hu/LC_MESSAGES/kaffeine.mo
share/locale/it/LC_MESSAGES/kaffeine.mo
share/locale/ja/LC_MESSAGES/kaffeine.mo
share/locale/ka/LC_MESSAGES/kaffeine.mo
share/locale/km/
share/locale/km/LC_MESSAGES/
share/locale/km/LC_MESSAGES/kaffeine.mo
share/locale/lt/LC_MESSAGES/kaffeine.mo
share/locale/mk/LC_MESSAGES/kaffeine.mo
share/locale/nb/LC_MESSAGES/kaffeine.mo
@ -121,8 +128,9 @@ share/locale/xx/
share/locale/xx/LC_MESSAGES/
share/locale/xx/LC_MESSAGES/kaffeine.mo
share/locale/zh_CN/LC_MESSAGES/kaffeine.mo
share/locale/zh_TW/LC_MESSAGES/kaffeine.mo
share/mimelnk/application/x-kaffeine.desktop
@comment share/mimelnk/application/x-mplayer2.desktop
share/services/kaffeine_part.desktop
share/services/kaffeineoggvorbis.desktop
share/services/xine_part.desktop
share/servicetypes/kaffeineaudioencoder.desktop