cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.8.3

Browse Source
This commit is contained in:
espie 2006-12-04 01:20:31 +00:00
parent 24baab49a6
commit 4971ebf88f
7 changed files with 63 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
multimedia/kaffeine/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.5 2006/11/13 11:20:25 steven Exp $
# $OpenBSD: Makefile,v 1.6 2006/12/04 01:20:31 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.2
DISTNAME= kaffeine-0.8.3
PKGNAME= ${DISTNAME}
EXTRACT_SUFX= .tar.bz2
@ -39,7 +39,7 @@ LIB_DEPENDS= kdecore.>=7,DCOP,kdesu,kio,kdefx,kparts,kutils,kdeprint,kdeui,kwal
cdda_interface,cdda_paranoia::audio/cdparanoia \
xine::multimedia/xine-lib
WANTLIB= X11 ICE Xrender SM Xinerama Xtst Xext freetype \
WANTLIB= X11 ICE Xrender SM Xext freetype Xinerama \
util m pthread z c stdc++ \
pcre pcreposix iconv jpeg ogg png idn intl art_lgpl_2

8
multimedia/kaffeine/distinfo
View File

@ -1,4 +1,4 @@
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
MD5 (kaffeine-0.8.3.tar.bz2) = 667dd56cf02f1343b3a466a685afdf24
RMD160 (kaffeine-0.8.3.tar.bz2) = f22a971481e8fd1a96063fef66d156d119c1e596
SHA1 (kaffeine-0.8.3.tar.bz2) = 6198ffe59422124855007a42443e2a69f6451e66
SIZE (kaffeine-0.8.3.tar.bz2) = 2940941

64
multimedia/kaffeine/patches/patch-configure_in
View File

@ -1,36 +1,34 @@
$OpenBSD: patch-configure_in,v 1.1.1.1 2006/06/11 10:32:57 espie Exp $
--- configure.in.orig Sat Jun 10 12:20:50 2006
+++ configure.in Sat Jun 10 12:32:07 2006
@@ -208,7 +208,7 @@ dnl ------------------------------------
dnl cdparanoia check
dnl -------------------------------------
$OpenBSD: patch-configure_in,v 1.2 2006/12/04 01:20:31 espie Exp $
--- configure.in.orig Sun Nov 26 20:28:33 2006
+++ configure.in Mon Dec 4 01:52:47 2006
@@ -152,16 +152,11 @@ LIB_XINERAMA=""
if test "$with_xinerama" != "no" ; then
AC_MSG_CHECKING([for Xinerama extension])
-AC_CHECK_HEADERS(cdda_interface.h, have_paranoia="yes", have_paranoia="no" )
+KDE_CHECK_HEADERS(cdda_interface.h, have_paranoia="yes", have_paranoia="no" )
- if "$PKG_CONFIG" --exists xinerama ; then
- with_xinerama=yes
- CFLAGS_XINERAMA=`"$PKG_CONFIG" --cflags xinerama`
- LIB_XINERAMA=`"$PKG_CONFIG" --libs xinerama`
- AC_DEFINE([HAVE_XINERAMA],,[Xinerama extension available])
- AC_MSG_RESULT([yes])
- else
- with_xinerama=no
- AC_MSG_RESULT([no])
- fi
+ with_xinerama=yes
+ CFLAGS_XINERAMA="-I${ac_x_includes}"
+ LIB_XINERAMA="-L${ac_x_libraries} -lXinerama"
+ AC_DEFINE([HAVE_XINERAMA],,[Xinerama extension available])
+ AC_MSG_RESULT([yes])
fi
dnl ----------------------------------
dnl Can Kaffeine be compiled?
@@ -242,18 +242,14 @@ if test "$ac_cv_use_oggvorbis" = "yes";
AC_SUBST([CFLAGS_XINERAMA])
@@ -242,7 +237,7 @@ dnl --------------------
dnl check for cdparanoia
dnl --------------------
AC_MSG_CHECKING(for ogg/vorbis headers)
ogg_vorbis=no
- AC_TRY_COMPILE([
- #include <vorbis/codec.h>
- #include <vorbis/vorbisfile.h>
- ],[
- ],[
- ogg_vorbis=yes
- ])
+ KDE_CHECK_HEADER(vorbis/vorbisfile.h,
+ [ogg_vorbis=yes], [:])
+
AC_MSG_RESULT($ogg_vorbis)
if test x$ogg_vorbis = xyes; then
dnl we need the ogg_vorbis_lib because otherwise we override LIBS !
- AC_CHECK_LIB(vorbisfile,ov_open,ogg_vorbis_lib=yes,
- ogg_vorbis=no,[$all_libraries -lvorbisfile -lvorbis -logg])
+ KDE_CHECK_LIB(vorbisfile,ov_open,ogg_vorbis_lib=yes,
+ ogg_vorbis=no,[$all_libraries -lvorbisfile -lvorbis -logg -lm])
fi
if test x$ogg_vorbis = xyes; then
AC_DEFINE(OGG_VORBIS,1,[Define if you have ogg/vorbis installed])
-AC_CHECK_HEADER([cdda_interface.h], [with_cdparanoia=yes], [with_cdparanoia=no])
+KDE_CHECK_HEADER([cdda_interface.h], [with_cdparanoia=yes], [with_cdparanoia=no])
if test "$with_cdparanoia" != "yes" ; then
echo ""

12
multimedia/kaffeine/patches/patch-kaffeine_src_input_disc_paranoia_cpp
View File

@ -1,12 +0,0 @@
$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>

18
multimedia/kaffeine/patches/patch-kaffeine_src_instwizard_cpp
View File

@ -1,7 +1,7 @@
$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()
$OpenBSD: patch-kaffeine_src_instwizard_cpp,v 1.2 2006/12/04 01:20:31 espie Exp $
--- kaffeine/src/instwizard.cpp.orig Sun Nov 26 20:12:23 2006
+++ kaffeine/src/instwizard.cpp Mon Dec 4 00:42:01 2006
@@ -107,7 +107,7 @@ void InstWizard::internalWizard()
*/
//WIN32-CODECS
info << "<hr><b>" << i18n("WIN32 Codecs") << "...</b><br>";
@ -10,7 +10,7 @@ $OpenBSD: patch-kaffeine_src_instwizard_cpp,v 1.1 2006/10/29 23:36:39 espie Exp
QStringList entries = d.entryList("wmv*");
if (entries.count())
info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
@@ -121,13 +121,13 @@ void InstWizard::internalWizard()
@@ -125,13 +125,13 @@ void InstWizard::internalWizard()
else
{
d = QDir("/usr/local/lib");
@ -26,7 +26,7 @@ $OpenBSD: patch-kaffeine_src_instwizard_cpp,v 1.1 2006/10/29 23:36:39 espie Exp
if (entries.count())
dvdcss = true;
}
@@ -138,6 +138,7 @@ void InstWizard::internalWizard()
@@ -142,6 +142,7 @@ void InstWizard::internalWizard()
else
info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
@ -34,15 +34,15 @@ $OpenBSD: patch-kaffeine_src_instwizard_cpp,v 1.1 2006/10/29 23:36:39 espie Exp
//DVD-DRIVE
info << "<br><hr><b>" << i18n("DVD Drive") << "...</b><br>";
KProcess process;
@@ -152,6 +153,7 @@ void InstWizard::internalWizard()
@@ -156,6 +157,7 @@ void InstWizard::internalWizard()
else
info << "<font color=\"DarkBlue\">" << i18n("Can't check DMA mode. Permission denied or no such device:")
<< " \"/dev/dvd\".</font>";
+#endif
//DVB-DEVICES
#ifdef HAVE_LINUX_DVB_FRONTEND_H
@@ -270,5 +272,6 @@ void InstWizard::slotStdout(KProcess *,
#ifdef HAVE_DVB
@@ -274,5 +276,6 @@ void InstWizard::slotStdout(KProcess *,
{
QString output = QString::fromLatin1(buffer, buflen);
kdDebug() << "WizardDialog: got from hdparm: " << output << "\n";

12
multimedia/kaffeine/patches/patch-kaffeine_src_kaffeine_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-kaffeine_src_kaffeine_cpp,v 1.1 2006/12/04 01:20:31 espie Exp $
--- kaffeine/src/kaffeine.cpp.orig Mon Dec 4 01:14:18 2006
+++ kaffeine/src/kaffeine.cpp Mon Dec 4 01:17:16 2006
@@ -25,6 +25,8 @@
#include "kaffeine.h"
+#undef Bool
+#undef Unsorted
#include <dcopref.h>
#include <kkeydialog.h>
#include <kfiledialog.h>

9
multimedia/kaffeine/pkg/PLIST
View File

@ -1,13 +1,11 @@
@comment $OpenBSD: PLIST,v 1.3 2006/10/29 23:36:39 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2006/12/04 01:20:31 espie Exp $
bin/kaffeine
include/kaffeine/
include/kaffeine/kaffeineaudioencoder.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}/libxinepart.la
@ -15,7 +13,7 @@ ${KDE}/libxinepart.so
lib/libkaffeineaudioencoder.la
@lib lib/libkaffeineaudioencoder.so.${LIBkaffeineaudioencoder_VERSION}
lib/libkaffeinepart.la
@lib lib/libkaffeinepart.so.${LIBkaffeinepart_VERSION}
lib/libkaffeinepart.so
share/applications/kde/kaffeine.desktop
share/apps/kaffeine/
share/apps/kaffeine/dvbdata.tar.gz
@ -25,7 +23,7 @@ share/apps/kaffeine/kaffeineui.rc
share/apps/kaffeine/logo
share/apps/kaffeine/logo.mpg
share/apps/kaffeine/mms.protocol
share/apps/kaffeine/nocover
share/apps/kaffeine/nocover.png
share/apps/kaffeine/pics/
share/apps/kaffeine/pics/playing.png
share/apps/kaffeine/rtsp.protocol
@ -116,6 +114,7 @@ share/locale/pl/LC_MESSAGES/kaffeine.mo
share/locale/pt/LC_MESSAGES/kaffeine.mo
share/locale/pt_BR/LC_MESSAGES/kaffeine.mo
share/locale/ru/LC_MESSAGES/kaffeine.mo
share/locale/sk/LC_MESSAGES/kaffeine.mo
share/locale/sr/LC_MESSAGES/kaffeine.mo
share/locale/sr@Latn/LC_MESSAGES/kaffeine.mo
share/locale/sv/LC_MESSAGES/kaffeine.mo