From 4fa4a26d96c99d6a3db1636dbd8b21c910eb7e8e Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 1 Jul 2006 14:55:07 +0000 Subject: mutt: added #include in keymap.h to make it compile also added PR in both bb files --- packages/mutt/mutt-1.5.4i/keymap.h.patch | 11 +++++++++++ packages/mutt/mutt_1.5.4i.bb | 2 ++ packages/mutt/mutt_1.5.9i.bb | 1 + 3 files changed, 14 insertions(+) create mode 100644 packages/mutt/mutt-1.5.4i/keymap.h.patch diff --git a/packages/mutt/mutt-1.5.4i/keymap.h.patch b/packages/mutt/mutt-1.5.4i/keymap.h.patch new file mode 100644 index 0000000000..40995aa58f --- /dev/null +++ b/packages/mutt/mutt-1.5.4i/keymap.h.patch @@ -0,0 +1,11 @@ +--- mutt-1.5.4/keymap.h.orig 2006-07-01 16:50:25.000000000 +0200 ++++ mutt-1.5.4/keymap.h 2006-07-01 16:50:58.000000000 +0200 +@@ -19,6 +19,8 @@ + #ifndef KEYMAP_H + #define KEYMAP_H + ++#include "mapping.h" ++ + /* maximal length of a key binding sequence used for buffer in km_bindkey */ + #define MAX_SEQ 8 + diff --git a/packages/mutt/mutt_1.5.4i.bb b/packages/mutt/mutt_1.5.4i.bb index e6e90dfd1e..50c6019e21 100644 --- a/packages/mutt/mutt_1.5.4i.bb +++ b/packages/mutt/mutt_1.5.4i.bb @@ -7,6 +7,7 @@ bindings, keyboard macros, mail threading, regular expression \ searches, and a powerful pattern matching language for selecting \ groups of messages." LICENSE = "GPL" +PR = "r1" SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \ http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.rr.compressed.gz;patch=1 \ http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.nntp.gz;patch=1 \ @@ -14,6 +15,7 @@ SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \ http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.quote.gz;patch=1 \ file://cppflags.patch;patch=1 \ file://posix1_lim.patch;patch=1 \ + file://keymap.h.patch;patch=1 \ file://configure.patch;patch=1" S = "${WORKDIR}/mutt-1.5.4" diff --git a/packages/mutt/mutt_1.5.9i.bb b/packages/mutt/mutt_1.5.9i.bb index c6939454d2..3192eb50f5 100644 --- a/packages/mutt/mutt_1.5.9i.bb +++ b/packages/mutt/mutt_1.5.9i.bb @@ -7,6 +7,7 @@ bindings, keyboard macros, mail threading, regular expression \ searches, and a powerful pattern matching language for selecting \ groups of messages." LICENSE = "GPL" +PR = "r0" SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \ http://mutt.kiev.ua/download/mutt-1.5.9/patch-1.5.9.rr.compressed.gz;patch=1 \ http://mutt.kiev.ua/download/mutt-1.5.9/patch-1.5.9.vvv.nntp.gz;patch=1 \ -- cgit v1.2.3 From 3aeea2ca2dfc7ba2d685f059924a1a433e0eb26f Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 1 Jul 2006 15:10:32 +0000 Subject: mdadm: added CFLAGS += "-fno-strict-aliasing" to avoid build errors a clean solution would be to fix the error in the source, but that is more intrusive --- packages/mdadm/mdadm.inc | 3 +++ packages/mdadm/mdadm_1.12.0.bb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/mdadm/mdadm.inc b/packages/mdadm/mdadm.inc index 25a4a5ed1d..5b293b7a68 100644 --- a/packages/mdadm/mdadm.inc +++ b/packages/mdadm/mdadm.inc @@ -7,6 +7,9 @@ LICENSE = "GPL" SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/${PN}-${PV}.tar.bz2" +CFLAGS += "-fno-strict-aliasing" + + inherit autotools INHIBIT_AUTO_STAGE = "1" diff --git a/packages/mdadm/mdadm_1.12.0.bb b/packages/mdadm/mdadm_1.12.0.bb index f41b36fba9..9fa79120b7 100644 --- a/packages/mdadm/mdadm_1.12.0.bb +++ b/packages/mdadm/mdadm_1.12.0.bb @@ -1,4 +1,4 @@ include mdadm.inc -PR = "r2" +PR = "r3" SRC_URI += " file://build_flags.patch;patch=1 " -- cgit v1.2.3 From f600e2487c6dc000c1ba50f67c0c7a015eb2046f Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 1 Jul 2006 15:29:41 +0000 Subject: ircp: added EXTRA_OECONF="--prefix=${D}" to bb file to make it work --- packages/ircp/ircp_0.3.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/ircp/ircp_0.3.bb b/packages/ircp/ircp_0.3.bb index 7f65f0b870..1e17b87bed 100644 --- a/packages/ircp/ircp_0.3.bb +++ b/packages/ircp/ircp_0.3.bb @@ -1,7 +1,11 @@ DEPENDS = "openobex" LICENSE = "GPL" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/ircp-${PV}.tar.gz" +EXTRA_OECONF="--prefix=${D}" + + inherit autotools -- cgit v1.2.3 From 808a7ab4aa66b8a1d58e6e5bb4c7c98231b31857 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 1 Jul 2006 17:03:48 +0000 Subject: radlib: removed /usr/include and friends from include path --- packages/radlib/files/.mtn2git_empty | 0 packages/radlib/files/Makefile.am.patch | 24 ++++++++++++++++++++++++ packages/radlib/radlib-common.inc | 3 ++- packages/radlib/radlib-mysql_2.6.2.bb | 2 +- packages/radlib/radlib_2.6.2.bb | 2 +- packages/radlib/x | 1 + 6 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 packages/radlib/files/.mtn2git_empty create mode 100644 packages/radlib/files/Makefile.am.patch create mode 100644 packages/radlib/x diff --git a/packages/radlib/files/.mtn2git_empty b/packages/radlib/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/radlib/files/Makefile.am.patch b/packages/radlib/files/Makefile.am.patch new file mode 100644 index 0000000000..e1e0e47c2c --- /dev/null +++ b/packages/radlib/files/Makefile.am.patch @@ -0,0 +1,24 @@ +--- radlib-2.6.2/src/Makefile.am.orig 2006-07-01 18:56:09.000000000 +0200 ++++ radlib-2.6.2/src/Makefile.am 2006-07-01 18:56:48.000000000 +0200 +@@ -14,8 +14,8 @@ + + if MYSQL + MY_INCLUDES = \ +- -I$(prefix)/include/mysql \ +- -I/usr/include/mysql ++ -I$(prefix)/include/mysql ++ + MY_SOURCES = \ + $(top_srcdir)/database/mysql/my_database.c \ + $(top_srcdir)/src/raddatabase.c +@@ -24,8 +24,8 @@ + endif + if PGRESQL + PG_INCLUDES = \ +- -I$(prefix)/include \ +- -I/usr/include ++ -I$(prefix)/include ++ + PG_SOURCES = \ + $(top_srcdir)/database/postgresql/pg_database.c \ + $(top_srcdir)/src/raddatabase.c diff --git a/packages/radlib/radlib-common.inc b/packages/radlib/radlib-common.inc index 528515b2cd..ba0f6db019 100644 --- a/packages/radlib/radlib-common.inc +++ b/packages/radlib/radlib-common.inc @@ -4,7 +4,8 @@ DESCRIPTION = "radlib is a rapid application development library for unix interp MAINTAINER = "Mark Teel (mark@teel.ws)" HOMEPAGE = "http://www.radlib.teel.ws/" -SRC_URI = "${SOURCEFORGE_MIRROR}/radlib/radlib-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/radlib/radlib-${PV}.tar.gz \ + file://Makefile.am.patch;patch=1" S = "${WORKDIR}/radlib-${PV}" diff --git a/packages/radlib/radlib-mysql_2.6.2.bb b/packages/radlib/radlib-mysql_2.6.2.bb index 93375c8300..61b5b8c5ef 100644 --- a/packages/radlib/radlib-mysql_2.6.2.bb +++ b/packages/radlib/radlib-mysql_2.6.2.bb @@ -1,3 +1,3 @@ include radlib-common.inc include radlib-mysql.inc -PR = "r0" +PR = "r1" diff --git a/packages/radlib/radlib_2.6.2.bb b/packages/radlib/radlib_2.6.2.bb index be5f2d0257..a123adc785 100644 --- a/packages/radlib/radlib_2.6.2.bb +++ b/packages/radlib/radlib_2.6.2.bb @@ -1,3 +1,3 @@ include radlib-common.inc include radlib.inc -PR = "r0" +PR = "r1" diff --git a/packages/radlib/x b/packages/radlib/x new file mode 100644 index 0000000000..c27c3cae43 --- /dev/null +++ b/packages/radlib/x @@ -0,0 +1 @@ + file://Makefile.am.patch;patch=1" -- cgit v1.2.3 From 0bc469ac999a2b4e50fe92cdb71bdc54695f6440 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 1 Jul 2006 17:06:01 +0000 Subject: wview: removed /usr/include from list of include dirs --- packages/wview/files/.mtn2git_empty | 0 packages/wview/files/Makefile.am.patch | 24 ++++++++++++++++++++++++ packages/wview/wview-common.inc | 5 +++-- packages/wview/wview-sim_3.1.3.bb | 2 +- packages/wview/wview-vpro_3.1.3.bb | 2 +- packages/wview/wview-wxt510_3.1.3.bb | 2 +- 6 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 packages/wview/files/.mtn2git_empty create mode 100644 packages/wview/files/Makefile.am.patch diff --git a/packages/wview/files/.mtn2git_empty b/packages/wview/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wview/files/Makefile.am.patch b/packages/wview/files/Makefile.am.patch new file mode 100644 index 0000000000..1c35ee8c29 --- /dev/null +++ b/packages/wview/files/Makefile.am.patch @@ -0,0 +1,24 @@ +--- wview-3.1.3/wunderground/Makefile.am.orig 2006-07-01 18:28:45.000000000 +0200 ++++ wview-3.1.3/wunderground/Makefile.am 2006-07-01 18:29:23.000000000 +0200 +@@ -9,8 +9,6 @@ + INCLUDES = \ + -I$(top_srcdir)/common \ + -I$(prefix)/include \ +- -I/usr/include \ +- -I/usr/local/include \ + -D_GNU_SOURCE \ + -DBUILD_WVWUNDERGROUND + +@@ -36,10 +34,10 @@ + endif + + # define library directories +-wvwunderd_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib ++wvwunderd_LDFLAGS = -L$(prefix)/lib + + if DB_MYSQL +-wvwunderd_LDFLAGS += -L$(prefix)/lib/mysql -L/usr/lib/mysql ++wvwunderd_LDFLAGS += -L$(prefix)/lib/mysql + else + if DB_PGRESQL + wvwunderd_LDFLAGS += -L$(prefix)/lib -L$(prefix)/pgsql/lib diff --git a/packages/wview/wview-common.inc b/packages/wview/wview-common.inc index 0efeee271c..0df0707718 100644 --- a/packages/wview/wview-common.inc +++ b/packages/wview/wview-common.inc @@ -5,13 +5,14 @@ MAINTAINER = "Mark Teel (mark@teel.ws)" HOMEPAGE = "http://www.wviewweather.com/" DEPENDS += " bash util-linux gd openssl curl update-rc.d" -SRC_URI = "${SOURCEFORGE_MIRROR}/wview/wview-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/wview/wview-${PV}.tar.gz \ + file://Makefile.am.patch;patch=1" S = "${WORKDIR}/wview-${PV}" inherit autotools -EXTRA_OECONF += " --enable-wunderground" +EXTRA_OECONF += "--prefix=${D} --enable-wunderground" do_install_append() { install -d ${D}/${sysconfdir}/init.d diff --git a/packages/wview/wview-sim_3.1.3.bb b/packages/wview/wview-sim_3.1.3.bb index 919e322f42..3f07aecc82 100644 --- a/packages/wview/wview-sim_3.1.3.bb +++ b/packages/wview/wview-sim_3.1.3.bb @@ -1,4 +1,4 @@ include wview-common.inc include wview.inc EXTRA_OECONF += " --enable-station-sim" -PR = "r0" +PR = "r1" diff --git a/packages/wview/wview-vpro_3.1.3.bb b/packages/wview/wview-vpro_3.1.3.bb index 1933e077b5..4c84152f3b 100644 --- a/packages/wview/wview-vpro_3.1.3.bb +++ b/packages/wview/wview-vpro_3.1.3.bb @@ -1,4 +1,4 @@ include wview-common.inc include wview.inc EXTRA_OECONF += " --enable-station-vpro" -PR = "r0" +PR = "r1" diff --git a/packages/wview/wview-wxt510_3.1.3.bb b/packages/wview/wview-wxt510_3.1.3.bb index b7b0ef236d..84f175f1d8 100644 --- a/packages/wview/wview-wxt510_3.1.3.bb +++ b/packages/wview/wview-wxt510_3.1.3.bb @@ -1,4 +1,4 @@ include wview-common.inc include wview.inc EXTRA_OECONF += " --enable-station-wxt510" -PR = "r0" +PR = "r1" -- cgit v1.2.3 From 7c3472eee98c335d0d5f42cd879b2c8e5d5bcacc Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 1 Jul 2006 17:27:05 +0000 Subject: xinetd: slightly changed code to make it compilable with gcc 4.1.1 --- packages/xinetd/xinetd/service.c.patch | 24 ++++++++++++++++++++++++ packages/xinetd/xinetd_2.3.13.bb | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 packages/xinetd/xinetd/service.c.patch diff --git a/packages/xinetd/xinetd/service.c.patch b/packages/xinetd/xinetd/service.c.patch new file mode 100644 index 0000000000..b94ae2184f --- /dev/null +++ b/packages/xinetd/xinetd/service.c.patch @@ -0,0 +1,24 @@ +--- xinetd-2.3.13/xinetd/service.c.orig 2006-07-01 19:14:23.000000000 +0200 ++++ xinetd-2.3.13/xinetd/service.c 2006-07-01 19:22:28.000000000 +0200 +@@ -764,8 +764,8 @@ + return FAILED; + + if ( last == NULL ) { +- last = SAIN( SVC_LAST_DGRAM_ADDR(sp) ) = +- SAIN( calloc( 1, sizeof(union xsockaddr) ) ); ++ last = SAIN(calloc( 1, sizeof(union xsockaddr) ) ); ++ SVC_LAST_DGRAM_ADDR(sp) = (union xsockaddr *)last; + } + + (void) time( ¤t_time ) ; +@@ -791,8 +791,8 @@ + return FAILED; + + if( last == NULL ) { +- last = SAIN6(SVC_LAST_DGRAM_ADDR(sp)) = +- SAIN6(calloc( 1, sizeof(union xsockaddr) ) ); ++ last = SAIN6(calloc( 1, sizeof(union xsockaddr) ) ); ++ SVC_LAST_DGRAM_ADDR(sp) = (union xsockaddr *)last; + } + + (void) time( ¤t_time ) ; diff --git a/packages/xinetd/xinetd_2.3.13.bb b/packages/xinetd/xinetd_2.3.13.bb index 699667cb26..4e67384d45 100644 --- a/packages/xinetd/xinetd_2.3.13.bb +++ b/packages/xinetd/xinetd_2.3.13.bb @@ -1,11 +1,12 @@ DEPENDS = "" DESCRIPTION = "Highly configurable, modular and secure inetd" MAINTAINER = "NSLU2 Linux " -PR="r3" +PR="r4" SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \ file://xinetd.init \ file://xinetd.conf \ + file://service.c.patch;patch=1 \ " EXTRA_OECONF="--disable-nls" -- cgit v1.2.3 From d30b20595c8c682f10a1ab2ef6ec44b87583c561 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Sat, 1 Jul 2006 17:36:39 +0000 Subject: scummvm/files/gcc-4.x.x-accept.patch: Makes scummvm approve of gcc 4.x.x * Adds gcc 4.x.x to accept list scummvm/files/sh3-linux-new-arch.patch: Makes scummvm know of sh3 * Adds linux-sh3 to the configure script of known archs scummvm/files/tail-obselete-fix.patch: sets -n 1 instead of -1 * Sets tail -n 1 instead of -1, kept for future reference. --- packages/scummvm/files/gcc-4.x.x-accept.patch | 11 +++++++++++ packages/scummvm/files/sh3-linux-new-arch.patch | 18 ++++++++++++++++++ packages/scummvm/files/tail-obselete-fix.patch | 11 +++++++++++ packages/scummvm/scummvm_0.6.1b.bb | 5 ++++- 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 packages/scummvm/files/gcc-4.x.x-accept.patch create mode 100644 packages/scummvm/files/sh3-linux-new-arch.patch create mode 100644 packages/scummvm/files/tail-obselete-fix.patch diff --git a/packages/scummvm/files/gcc-4.x.x-accept.patch b/packages/scummvm/files/gcc-4.x.x-accept.patch new file mode 100644 index 0000000000..f69eb0f229 --- /dev/null +++ b/packages/scummvm/files/gcc-4.x.x-accept.patch @@ -0,0 +1,11 @@ +--- scummvm-0.6.1b/configure_orig 2006-07-01 16:42:17.000000000 +0000 ++++ scummvm-0.6.1b/configure 2006-07-01 16:48:04.000000000 +0000 +@@ -362,7 +362,7 @@ + fi + + case $cxx_version in +- 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]) ++ 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|4.[0-9].[0-9]) + _cxx_major=`echo $cxx_version | cut -d '.' -f 1` + _cxx_minor=`echo $cxx_version | cut -d '.' -f 2` + cxx_version="$cxx_version, ok" diff --git a/packages/scummvm/files/sh3-linux-new-arch.patch b/packages/scummvm/files/sh3-linux-new-arch.patch new file mode 100644 index 0000000000..b59d727458 --- /dev/null +++ b/packages/scummvm/files/sh3-linux-new-arch.patch @@ -0,0 +1,18 @@ +--- scummvm-0.6.1b/configure_orig 2006-07-01 17:15:30.000000000 +0000 ++++ scummvm-0.6.1b/configure 2006-07-01 17:19:41.000000000 +0000 +@@ -462,6 +462,15 @@ + type_2_byte='short' + type_4_byte='int' + ;; ++ sh3-linux) ++ echo "Crosscompiling to $_host, forcing endianess, aligment and type sizes" ++ DEFINES="$DEFINES -DUNIX" ++ _def_endianess='#define SCUMM_LITTLE_ENDIAN' ++ _def_align='#define SCUMM_NEED_ALiGMENT' ++ type_1_byte='char' ++ type_2_byte='short' ++ type_4_byte='int' ++ ;; + *) + echo "Cross-compiling to unknown target, please add your target to configure." + exit 1 diff --git a/packages/scummvm/files/tail-obselete-fix.patch b/packages/scummvm/files/tail-obselete-fix.patch new file mode 100644 index 0000000000..1737133e25 --- /dev/null +++ b/packages/scummvm/files/tail-obselete-fix.patch @@ -0,0 +1,11 @@ +--- scummvm-0.6.1b/configure_orig 2006-07-01 16:42:17.000000000 +0000 ++++ scummvm-0.6.1b/configure 2006-07-01 16:43:12.000000000 +0000 +@@ -355,7 +355,7 @@ + + echocheck "compiler version" + +-cxx_name=`( $cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1` ++cxx_name=`( $cc -v ) 2>&1 | tail -n 1 | cut -d ' ' -f 1` + cxx_version=`( $CXX -dumpversion ) 2>&1` + if test "$?" -gt 0; then + cxx_version="not found" diff --git a/packages/scummvm/scummvm_0.6.1b.bb b/packages/scummvm/scummvm_0.6.1b.bb index 6f805b6b4d..a2c0459b3e 100644 --- a/packages/scummvm/scummvm_0.6.1b.bb +++ b/packages/scummvm/scummvm_0.6.1b.bb @@ -1,6 +1,9 @@ include scummvm.inc DEPENDS = "virtual/libsdl libmad tremor libogg zlib libmpeg2" -SRC_URI += " file://mouse.patch;patch=1 " +SRC_URI += " file://mouse.patch;patch=1 \ + file://gcc-4.x.x-accept.patch;patch=1 \ + file://sh3-linux-new-arch.patch;patch=1 \ + file://tail-obselete-fix.patch;patch=1" do_compile() { oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ -- cgit v1.2.3 From a47ce513883783a06e884b641f7346db39cecabd Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 1 Jul 2006 17:51:39 +0000 Subject: mpd: added --prefix to remove /usr/include --- packages/musicpd/mpd-alsa_0.11.5.bb | 5 +++-- packages/musicpd/mpd_0.11.5.bb | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/musicpd/mpd-alsa_0.11.5.bb b/packages/musicpd/mpd-alsa_0.11.5.bb index d4ee65abba..5acc6071d3 100644 --- a/packages/musicpd/mpd-alsa_0.11.5.bb +++ b/packages/musicpd/mpd-alsa_0.11.5.bb @@ -5,7 +5,7 @@ MAINTAINER = "Chris Larson " SECTION = "console/multimedia" DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv" RDEPENDS = "libao-alsa" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \ file://mpd/save-volume-state.patch;patch=1 file://mpd/mpd.init" @@ -19,7 +19,8 @@ INITSCRIPT_NAME = "mpd" # in staging - remove the --with and replace with --enable to use the local # versions. -EXTRA_OECONF = "--enable-ogg \ +EXTRA_OECONF = "--prefix=${D} \ + --enable-ogg \ --with-id3tag-libraries=${STAGING_LIBDIR} \ --with-id3tag-includes=${STAGING_INCDIR} \ --with-mad-libraries=${STAGING_LIBDIR} \ diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb index a4ef4e9289..0d41cf3e0a 100644 --- a/packages/musicpd/mpd_0.11.5.bb +++ b/packages/musicpd/mpd_0.11.5.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" MAINTAINER = "Chris Larson " SECTION = "console/multimedia" DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv" -PR = "r5" +PR = "r6" SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \ file://save-volume-state.patch;patch=1" @@ -16,7 +16,8 @@ inherit autotools # in staging - remove the --with and replace with --enable to use the local # versions. -EXTRA_OECONF = "--enable-ogg \ +EXTRA_OECONF = "--prefix=${D} \ + --enable-ogg \ --with-id3tag-libraries=${STAGING_LIBDIR} \ --with-id3tag-includes=${STAGING_INCDIR} \ --with-mad-libraries=${STAGING_LIBDIR} \ -- cgit v1.2.3 From 616d940c6bf364dbc98e6fe9e5ea76ad8f44de39 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Sat, 1 Jul 2006 18:40:24 +0000 Subject: scummvm/scummvm_0.9.0: Addition of new scummvm file * New scummvm file (upgrade from 0.6.1b) scummvm/scummvm.inc: Change of sourceforge mirror * Change of sourceforge mirror, heanet.dl didnt have scummvm. --- packages/scummvm/scummvm.inc | 3 +-- packages/scummvm/scummvm_0.9.0.bb | 10 ++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 packages/scummvm/scummvm_0.9.0.bb diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc index 88c6f13d9d..e39397be06 100644 --- a/packages/scummvm/scummvm.inc +++ b/packages/scummvm/scummvm.inc @@ -3,8 +3,7 @@ SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" -SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \ - file://tremor.patch;patch=1" +SRC_URI = "http://puzzle.dl.sourceforge.net/scummvm/scummvm-${PV}.tar.bz2" inherit autotools diff --git a/packages/scummvm/scummvm_0.9.0.bb b/packages/scummvm/scummvm_0.9.0.bb new file mode 100644 index 0000000000..fd89e8fa1c --- /dev/null +++ b/packages/scummvm/scummvm_0.9.0.bb @@ -0,0 +1,10 @@ +include scummvm.inc +DEPENDS = "virtual/libsdl libmad tremor libogg zlib libmpeg2" +SRC_URI += "file://sh3-arch-0.9.0+.patch;patch=1" + +do_compile() { + oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ + DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2" +} + + -- cgit v1.2.3 From b489e053a8f6288f335a945f0f7780cafaa5e3f1 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Sat, 1 Jul 2006 18:42:50 +0000 Subject: scummvm/files/sh3-arch-0.9.0+.patch: Patch for sh3 to > 0.9.0 scummvm * Addition of sh3 arch, should work for after also. --- packages/scummvm/files/sh3-arch-0.9.0+.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 packages/scummvm/files/sh3-arch-0.9.0+.patch diff --git a/packages/scummvm/files/sh3-arch-0.9.0+.patch b/packages/scummvm/files/sh3-arch-0.9.0+.patch new file mode 100644 index 0000000000..3cd0505654 --- /dev/null +++ b/packages/scummvm/files/sh3-arch-0.9.0+.patch @@ -0,0 +1,18 @@ +--- scummvm-0.9.0/configure_orig 2006-07-01 18:16:04.000000000 +0000 ++++ scummvm-0.9.0/configure 2006-07-01 18:19:09.000000000 +0000 +@@ -762,6 +762,15 @@ + type_2_byte='short' + type_4_byte='int' + ;; ++ sh3-linux) ++ echo "Cross-compiling to $_host, forcing endianness, aligment and type sizes" ++ DEFINES="$DEFINES -DUNIX" ++ _def_endianness='#define SCUMM_LITTLE_ENDIAN' ++ _def_align='#define SCUMM_NEED_ALIGMENT' ++ type_1_byte='char' ++ type_2_byte='short' ++ type_4_byte='int' ++ ;; + ppc-amigaos) + echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes" + _def_endianness='#define SCUMM_BIG_ENDIAN' -- cgit v1.2.3 From a4541c4a2517a12d0be5b2919de268b8706496d8 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sat, 1 Jul 2006 19:03:22 +0000 Subject: samba: Add missing directory /etc/samba/private --- packages/samba/samba-essential_3.0.20.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/samba/samba-essential_3.0.20.bb b/packages/samba/samba-essential_3.0.20.bb index 50d4e432e5..4cee9541bd 100644 --- a/packages/samba/samba-essential_3.0.20.bb +++ b/packages/samba/samba-essential_3.0.20.bb @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -42,6 +42,8 @@ do_install_append() { rm -f ${D}/sbin/mount.smbfs rmdir ${D}/sbin install -d "${D}${sysconfdir}/init.d" + install -d "${D}${sysconfdir}/samba/private" + install -c -m 755 ${WORKDIR}/init-essential ${D}${sysconfdir}/init.d/samba install -d "${D}${sysconfdir}/samba" -- cgit v1.2.3 From 80536b3d65d2cbc8677242aa341298b19064c87c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 1 Jul 2006 21:39:30 +0000 Subject: scummvm 0.9.0: depend on libvorbis since the tremor patch hasn't been forward ported yet --- packages/scummvm/scummvm_0.9.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/scummvm/scummvm_0.9.0.bb b/packages/scummvm/scummvm_0.9.0.bb index fd89e8fa1c..2f8e9382bb 100644 --- a/packages/scummvm/scummvm_0.9.0.bb +++ b/packages/scummvm/scummvm_0.9.0.bb @@ -1,5 +1,5 @@ include scummvm.inc -DEPENDS = "virtual/libsdl libmad tremor libogg zlib libmpeg2" +DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib libmpeg2" SRC_URI += "file://sh3-arch-0.9.0+.patch;patch=1" do_compile() { -- cgit v1.2.3 From 4d95dd19f5a8a5683efd5c563d1eb1b48a4e1238 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Sat, 1 Jul 2006 23:18:01 +0000 Subject: scummvm/scummvm_0.6.1b.bb: Addition of tremor patch * Addition of tremor patch to 0.6.1b as this was removed from the include file (no longer needed for new versions) --- packages/scummvm/scummvm_0.6.1b.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/scummvm/scummvm_0.6.1b.bb b/packages/scummvm/scummvm_0.6.1b.bb index a2c0459b3e..313737bc92 100644 --- a/packages/scummvm/scummvm_0.6.1b.bb +++ b/packages/scummvm/scummvm_0.6.1b.bb @@ -3,7 +3,8 @@ DEPENDS = "virtual/libsdl libmad tremor libogg zlib libmpeg2" SRC_URI += " file://mouse.patch;patch=1 \ file://gcc-4.x.x-accept.patch;patch=1 \ file://sh3-linux-new-arch.patch;patch=1 \ - file://tail-obselete-fix.patch;patch=1" + file://tail-obselete-fix.patch;patch=1 \ + file://tremor.patch;patch=1" do_compile() { oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ -- cgit v1.2.3