fix build for xenocara. Bump pkgname, since I'm not 100% this builds exactly

the same.
This commit is contained in:
espie 2007-04-07 16:29:15 +00:00
parent 3c021b0b04
commit 195dd0b84f
5 changed files with 23 additions and 37 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2006/12/04 01:20:31 espie Exp $
# $OpenBSD: Makefile,v 1.7 2007/04/07 16:29:15 espie Exp $
CATEGORIES= multimedia x11 x11/kde
COMMENT= 'video player for kde'
@ -6,7 +6,7 @@ COMMENT= 'video player for kde'
HOMEPAGE= http://kaffeine.sourceforge.net/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kaffeine/}
DISTNAME= kaffeine-0.8.3
PKGNAME= ${DISTNAME}
PKGNAME= ${DISTNAME}p0
EXTRACT_SUFX= .tar.bz2

View File

@ -1,29 +1,7 @@
$OpenBSD: patch-configure_in,v 1.2 2006/12/04 01:20:31 espie Exp $
$OpenBSD: patch-configure_in,v 1.3 2007/04/07 16:29:15 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])
- 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
AC_SUBST([CFLAGS_XINERAMA])
@@ -242,7 +237,7 @@ dnl --------------------
+++ configure.in Sat Apr 7 17:58:32 2007
@@ -242,7 +242,7 @@ dnl --------------------
dnl check for cdparanoia
dnl --------------------

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-kaffeine_src_instwizard_cpp,v 1.2 2006/12/04 01:20:31 espie Exp $
$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 Mon Dec 4 00:42:01 2006
+++ kaffeine/src/instwizard.cpp Sat Apr 7 17:57:51 2007
@@ -107,7 +107,7 @@ void InstWizard::internalWizard()
*/
//WIN32-CODECS
@ -42,7 +42,7 @@ $OpenBSD: patch-kaffeine_src_instwizard_cpp,v 1.2 2006/12/04 01:20:31 espie Exp
//DVB-DEVICES
#ifdef HAVE_DVB
@@ -274,5 +276,6 @@ void InstWizard::slotStdout(KProcess *,
@@ -274,5 +276,6 @@ void InstWizard::slotStdout(KProcess *, char *buffer,
{
QString output = QString::fromLatin1(buffer, buflen);
kdDebug() << "WizardDialog: got from hdparm: " << output << "\n";

View File

@ -1,7 +1,7 @@
$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:
$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
@@ -44,6 +44,7 @@ class InstWizard : private KWizard (private)
void internalWizard();

View File

@ -1,6 +1,6 @@
$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
$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
@@ -25,6 +25,8 @@
#include "kaffeine.h"
@ -10,3 +10,11 @@ $OpenBSD: patch-kaffeine_src_kaffeine_cpp,v 1.1 2006/12/04 01:20:31 espie Exp $
#include <dcopref.h>
#include <kkeydialog.h>
#include <kfiledialog.h>
@@ -85,6 +87,7 @@
#define DEFAULT_PLAYER_PART "xine_part"
+#include <X11/Xdefs.h>
#include <X11/Xlib.h>
#ifdef HAVE_DPMS