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

- patch a silly test that uses OS specific device names, thus allowing

Browse Source 
kaffeine to play/rip audio CDs
- capitalize KDE in COMMENT
- remove extra blank lines in Makefile
- use AUTOCONF_VERSION=2.60 so autoconf doesn't complain about
  a different version having previously been used to create configure
- add license marker
- sync patches w/update-patches
- add expat and fontconfig to WANTLIB, as per lib-depends-check
- bsd.port.mk(5) names only `simple' as a valid value for SEPARATE_BUILD,
  so use `simple' instead of `Yes'
- bump PKGNAME

audio CD patch OK espie@
rest mostly from and OK brad@
This commit is contained in:
jakemsr 2007-06-18 23:24:06 +00:00
parent 7fdac52af0
commit 022457e96b
5 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
multimedia/kaffeine/Makefile
View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.9 2007/06/04 19:33:17 espie Exp $
# $OpenBSD: Makefile,v 1.10 2007/06/18 23:24:06 jakemsr Exp $
CATEGORIES= multimedia x11 x11/kde
COMMENT= 'video player for kde'
COMMENT= 'video player for KDE'
HOMEPAGE= http://kaffeine.sourceforge.net/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kaffeine/}
DISTNAME= kaffeine-0.8.4
PKGNAME= ${DISTNAME}
PKGNAME= ${DISTNAME}p0
EXTRACT_SUFX= .tar.bz2
SHARED_ONLY= Yes
SHARED_LIBS += kaffeinepart 0.0 # .0.1
SHARED_LIBS += kaffeineaudioencoder 0.0 # .0.1
@ -19,7 +18,7 @@ USE_LIBTOOL= Yes
LIBTOOL_FLAGS= --tag=disable-static
MODKDE_VERSION= 3.5.3
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
AUTOCONF_VERSION= 2.60
CONFIGURE_ARGS+= ${MODKDE_CONFIGURE_ARGS}
CONFIGURE_ARGS+= --disable-libsuffix \
--without-gstreamer \
@ -32,7 +31,7 @@ CONFIGURE_ENV+= ${MODKDE_CONFIGURE_ENV}
MAKE_ENV= ${CONFIGURE_ENV}
MAKE_FLAGS+= ${MODKDE_MAKE_FLAGS}
MAKE_FLAGS+= LIBRESOLV=
SEPARATE_BUILD= Yes
SEPARATE_BUILD= simple
LIB_DEPENDS= kdecore.>=7,DCOP,kdesu,kio,kdefx,kparts,kutils,kdeprint,kdeui,kwalletclient,khtml,kjs::x11/kde/libs3 \
vorbis,vorbisenc::audio/libvorbis \
@ -40,15 +39,14 @@ LIB_DEPENDS= kdecore.>=7,DCOP,kdesu,kio,kdefx,kparts,kutils,kdeprint,kdeui,kwal
xine::multimedia/xine-lib
WANTLIB= X11 ICE Xrender SM Xext freetype Xinerama \
util m pthread z c stdc++ \
util m pthread z c stdc++ expat fontconfig \
pcre pcreposix iconv jpeg ogg png idn intl art_lgpl_2 \
Xau Xdmcp Xtst fam rpcsvc
# GPL
PERMIT_DISTFILES_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_PACKAGE_CDROM=Yes
.include <bsd.port.mk>

21
multimedia/kaffeine/patches/patch-kaffeine_src_input_disc_disc_cpp Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-kaffeine_src_input_disc_disc_cpp,v 1.1 2007/06/18 23:24:06 jakemsr Exp $
--- kaffeine/src/input/disc/disc.cpp.orig Sun May 27 01:31:44 2007
+++ kaffeine/src/input/disc/disc.cpp Sun May 27 01:32:39 2007
@@ -426,13 +426,13 @@ void Disc::startCD( const QString &device, bool rip )
else if ( devList.count()==1 )
s.append( devList[0] );
else {
- s.append( "/dev/cdrom" );
- s.append( "/dev/dvd" );
+ s.append( "/dev/rcd0c" );
+ s.append( "/dev/rcd1c" );
}
}
else {
- s.append( "/dev/cdrom" );
- s.append( "/dev/dvd" );
+ s.append( "/dev/rcd0c" );
+ s.append( "/dev/rcd1c" );
}
}

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

@ -1,6 +1,6 @@
$OpenBSD: patch-kaffeine_src_instwizard_cpp,v 1.3 2007/04/07 16:29:15 espie Exp $
--- kaffeine/src/instwizard.cpp.orig Sun Nov 26 20:12:23 2006
+++ kaffeine/src/instwizard.cpp Sat Apr 7 17:57:51 2007
$OpenBSD: patch-kaffeine_src_instwizard_cpp,v 1.4 2007/06/18 23:24:06 jakemsr Exp $
--- kaffeine/src/instwizard.cpp.orig Fri Apr 13 07:54:43 2007
+++ kaffeine/src/instwizard.cpp Mon Jun 18 01:07:55 2007
@@ -107,7 +107,7 @@ void InstWizard::internalWizard()
*/
//WIN32-CODECS

6
multimedia/kaffeine/patches/patch-kaffeine_src_instwizard_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-kaffeine_src_instwizard_h,v 1.2 2007/04/07 16:29:15 espie Exp $
--- kaffeine/src/instwizard.h.orig Sun Nov 26 20:12:23 2006
+++ kaffeine/src/instwizard.h Sat Apr 7 17:57:51 2007
$OpenBSD: patch-kaffeine_src_instwizard_h,v 1.3 2007/06/18 23:24:06 jakemsr Exp $
--- kaffeine/src/instwizard.h.orig Fri Apr 13 07:54:43 2007
+++ kaffeine/src/instwizard.h Mon Jun 18 01:07:55 2007
@@ -44,6 +44,7 @@ class InstWizard : private KWizard (private)
void internalWizard();

8
multimedia/kaffeine/patches/patch-kaffeine_src_kaffeine_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-kaffeine_src_kaffeine_cpp,v 1.2 2007/04/07 16:29:15 espie Exp $
--- kaffeine/src/kaffeine.cpp.orig Sun Nov 26 20:12:23 2006
+++ kaffeine/src/kaffeine.cpp Sat Apr 7 18:18:13 2007
$OpenBSD: patch-kaffeine_src_kaffeine_cpp,v 1.3 2007/06/18 23:24:06 jakemsr Exp $
--- kaffeine/src/kaffeine.cpp.orig Fri Apr 13 10:54:43 2007
+++ kaffeine/src/kaffeine.cpp Mon Apr 30 00:16:51 2007
@@ -25,6 +25,8 @@
#include "kaffeine.h"
@ -10,7 +10,7 @@ $OpenBSD: patch-kaffeine_src_kaffeine_cpp,v 1.2 2007/04/07 16:29:15 espie Exp $
#include <dcopref.h>
#include <kkeydialog.h>
#include <kfiledialog.h>
@@ -85,6 +87,7 @@
@@ -87,6 +89,7 @@
#define DEFAULT_PLAYER_PART "xine_part"