OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 17-Sep-2003 14:07:05
Branch: HEAD Handle: 2003091713070302
Added files:
openpkg-src/sdl sdl.patch
Modified files:
openpkg-src/sdl sdl.spec
openpkg-web news.txt
Log:
An unstudied hack, but at least works to fix the current build
problems on BSD
Summary:
Revision Changes Path
1.5 +16 -0 openpkg-src/sdl/sdl.patch
1.19 +3 -1 openpkg-src/sdl/sdl.spec
1.6596 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sdl/sdl.patch
============================================================================
$ cvs diff -u -r0 -r1.5 sdl.patch
--- /dev/null 2003-09-17 14:07:05.000000000 +0200
+++ sdl.patch 2003-09-17 14:07:05.000000000 +0200
@@ -0,0 +1,16 @@
+diff -Naur SDL-1.2.6.orig/src/joystick/bsd/SDL_sysjoystick.c
SDL-1.2.6/src/joystick/bsd/SDL_sysjoystick.c
+--- SDL-1.2.6.orig/src/joystick/bsd/SDL_sysjoystick.c 2003-08-30
21:13:05.000000000 +0200
++++ SDL-1.2.6/src/joystick/bsd/SDL_sysjoystick.c 2003-09-17 13:52:47.000000000
+0200
+@@ -49,10 +49,10 @@
+
+ #if defined(HAVE_USBHID_H)
+ #include <usbhid.h>
+-#elif defined(HAVE_LIBUSB_H)
+-#include <libusb.h>
+ #elif defined(HAVE_LIBUSBHID_H)
+ #include <libusbhid.h>
++#elif defined(HAVE_LIBUSB_H)
++#include <libusb.h>
+ #endif
+
+ #ifdef __FreeBSD__
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sdl/sdl.spec
============================================================================
$ cvs diff -u -r1.18 -r1.19 sdl.spec
--- openpkg-src/sdl/sdl.spec 31 Aug 2003 07:29:03 -0000 1.18
+++ openpkg-src/sdl/sdl.spec 17 Sep 2003 12:07:05 -0000 1.19
@@ -33,10 +33,11 @@
Group: XWindow
License: LGPL
Version: 1.2.6
-Release: 20030831
+Release: 20030917
# list of sources
Source0: http://www.libsdl.org/release/SDL-%{version}.tar.gz
+Patch0: sdl.patch
# build information
Prefix: %{l_prefix}
@@ -54,6 +55,7 @@
%prep
%setup -q -n SDL-%{version}
+ %patch -p1
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6595 -r1.6596 news.txt
--- openpkg-web/news.txt 17 Sep 2003 10:58:05 -0000 1.6595
+++ openpkg-web/news.txt 17 Sep 2003 12:07:03 -0000 1.6596
@@ -1,3 +1,4 @@
+17-Sep-2003: Upgraded package: P<sdl-1.2.6-20030917>
17-Sep-2003: Upgraded package: P<scribus-1.1.0-20030917>
17-Sep-2003: Upgraded package: P<netcat-1.10-20030917>
17-Sep-2003: Upgraded package: P<openssh-3.5p1-1.2.4>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]