diff options
Diffstat (limited to 'packages')
36 files changed, 426 insertions, 32 deletions
diff --git a/packages/bb/.mtn2git_empty b/packages/bb/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/bb/.mtn2git_empty diff --git a/packages/bb/bb_1.2.bb b/packages/bb/bb_1.2.bb new file mode 100644 index 0000000000..0629f74faf --- /dev/null +++ b/packages/bb/bb_1.2.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "bb, The portable aalib demo" +HOMEPAGE = "http://aa-project.sourceforge.net/bb/" +SECTION = "console/misc" +LICENSE = "GPLv2" +DEPENDS = "aalib" +PR = "r1" + +SRC_URI = "http://prdownloads.sourceforge.net/aa-project/bb-1.2.tar.gz \ + file://fix-compile.patch;patch=1" + +inherit autotools + +do_install() { + install -d ${D}${bindir} + install -m 755 bb ${D}${bindir} +} diff --git a/packages/bb/files/.mtn2git_empty b/packages/bb/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/bb/files/.mtn2git_empty diff --git a/packages/bb/files/fix-compile.patch b/packages/bb/files/fix-compile.patch new file mode 100644 index 0000000000..75641da1e5 --- /dev/null +++ b/packages/bb/files/fix-compile.patch @@ -0,0 +1,166 @@ +Index: bb-1.2/bb.h +=================================================================== +--- bb-1.2.orig/bb.h ++++ bb-1.2/bb.h +@@ -23,7 +23,11 @@ + + #ifndef BB_H + #define BB_H ++//#include <aaint.h> + #include <aalib.h> ++struct parameters { ++ unsigned int p[AA_NPARAMS]; ++}; + #include "image.h" + #include "timers.h" + struct font { +Index: bb-1.2/textform.c +=================================================================== +--- bb-1.2.orig/textform.c ++++ bb-1.2/textform.c +@@ -155,41 +155,41 @@ static char *text = "#cWell we've reache + "#c\n" + "#bThree goals of AA-Project:#n" + "\n\n" +-"#f1)Port all important software (like Doom, Second Reality, X windows etc..) on new AA-lib. +- +-2)Port AA-lib on all available platforms (mainly ZX-Spectrum and Sharp). +- +-3)Force IBM to start manufacturing MDA cards again. +- +-AA-project was started by Jan Hubicka. In that times just few people knew about \ +-it. Then a new demo named BB has been relased to show the power \ +-of AA-lib technology. Now the project is freely available and anyone can help. +- +-Just join our mailing list: #baa#n at#b horac.ta.jcu.cz.#n by sending #bsubscribe aa#n to majordomo. +- +-All programs covered under AA-project can be obtained at +-#c#bftp://ftp.ta.jcu.cz://pub/aa#n +-#c +-Or just browse our homepage at #bhttp://www.ta.jcu.cz://aa#n. Ton of \ +-examples of ascii-art generated by aalib, pointers to other AA-Project \ +-resources etc. +- +- We decided to distribute all of our aa-related programs freely (see \ +-COPYING for details). But if you want to help us develop more such software \ +-send a small amount (or big one ;-) to AA/BB maintainer address: +- +-Kamil Toman +-CS Armady 1930, Tabor +-390 03 +-Czech republic +- +-and contact us at: +- +-kupsaf@feld.cvut.cz (Filip Kupsa) +-hubicka@paru.cas.cz (Jan Hubicka) +-titania@horac.ta.jcu.cz (Mojmir Svoboda) +-toman@horac.ta.jcu.cz (Kamil Toman) +-#f" ++"#f1)Port all important software (like Doom, Second Reality, X windows etc..) on new AA-lib.\n" ++"\n" ++"2)Port AA-lib on all available platforms (mainly ZX-Spectrum and Sharp).\n" ++"\n" ++"3)Force IBM to start manufacturing MDA cards again.\n" ++"\n" ++"AA-project was started by Jan Hubicka. In that times just few people knew about " ++"it. Then a new demo named BB has been relased to show the power " ++"of AA-lib technology. Now the project is freely available and anyone can help.\n" ++"\n" ++"Just join our mailing list: #baa#n at#b horac.ta.jcu.cz.#n by sending #bsubscribe aa#n to majordomo.\n" ++"\n" ++"All programs covered under AA-project can be obtained at\n" ++"#c#bftp://ftp.ta.jcu.cz://pub/aa#n\n" ++"#c\n" ++"Or just browse our homepage at #bhttp://www.ta.jcu.cz://aa#n. Ton of " ++"examples of ascii-art generated by aalib, pointers to other AA-Project " ++"resources etc. \n" ++" \n" ++" We decided to distribute all of our aa-related programs freely (see " ++"COPYING for details). But if you want to help us develop more such software " ++"send a small amount (or big one ;-) to AA/BB maintainer address: \n" ++"\n" ++"Kamil Toman\n" ++"CS Armady 1930, Tabor\n" ++"390 03\n" ++"Czech republic\n" ++"\n" ++"and contact us at:\n" ++"\n" ++"kupsaf@feld.cvut.cz (Filip Kupsa)\n" ++"hubicka@paru.cas.cz (Jan Hubicka)\n" ++"titania@horac.ta.jcu.cz (Mojmir Svoboda)\n" ++"toman@horac.ta.jcu.cz (Kamil Toman)\n" ++"#f" + "\n" + "#l\n" + "#c#bAvailable programs#n\n" +@@ -245,37 +245,37 @@ toman@horac.ta.jcu.cz (Kamil Toman) + "\n#l" + "\n" + "#c#bThe AA-Lib#n\n" +-"#f#c +-AA-lib is a low level gfx library just as many other libraries are. The \ +-main difference is that AA-lib does not require graphics device. In fact, \ +-there is no graphical output possible. AA-lib replaces those old-fashioned \ +-output methods with powerful ascii-art renderer. Now my linux boots \ +-with a nice penguin logo at secondary display (yes! Like Win95 does:) \ +-AA-lib API is designed to be similar to other graphics libraries. Learning \ +-a new API would be a piece of cake! \ +-#f +- +-#l +-#c#bThe history#n +-#f +-Once upon a time we've (my friend Kamil and I) bought two old Herculeses \ +-as secondary monitors. We didn't know for that time that our Diamond \ +-Stealths 64 cards would become obsolete soon. Next day we downloaded \ +-the logo of Linux Texas Users Group \ +-- nice silly penguin looking like a cowboy! It was so exciting logo ... we \ +-decided that we couldn't live without it and we wanted to see it every time \ +-at a boot time as a logo on our secondary monitors. There was a small problem \ +-- Hercules doesn't support color graphics. So we decided to convert an image \ +-to ascii art using netpbm tools. +- +-The output was very ugly because the converting algorithm was absolutly stupid. \ +-During the night I designed a new convertor that used a font bitmap for \ +-creating aproximation table. The output wasn't very good since the algorithm \ +-wasn't so well tuned. Many months this small piece of code was waiting on my \ +-disc for the day \"D\". Meanwhile I started a new project XaoS (a fractal zoomer) \ +-with my friend Thomas. And then I got an idea: Ascii Art Mandelbrots! \ +-I was really impressed by the result! XaoS was faster, portable and looking \ +-much better than ever before. I found a new way to go... " ++"#f#c" ++"AA-lib is a low level gfx library just as many other libraries are. The " ++"main difference is that AA-lib does not require graphics device. In fact, " ++"there is no graphical output possible. AA-lib replaces those old-fashioned " ++"output methods with powerful ascii-art renderer. Now my linux boots " ++"with a nice penguin logo at secondary display (yes! Like Win95 does:) " ++"AA-lib API is designed to be similar to other graphics libraries. Learning " ++"a new API would be a piece of cake! " ++"#f" ++"\n" ++"#l" ++"#c#bThe history#n" ++"#f" ++"Once upon a time we've (my friend Kamil and I) bought two old Herculeses " ++"as secondary monitors. We didn't know for that time that our Diamond " ++"Stealths 64 cards would become obsolete soon. Next day we downloaded " ++"the logo of Linux Texas Users Group " ++"- nice silly penguin looking like a cowboy! It was so exciting logo ... we " ++"decided that we couldn't live without it and we wanted to see it every time " ++"at a boot time as a logo on our secondary monitors. There was a small problem " ++"- Hercules doesn't support color graphics. So we decided to convert an image " ++"to ascii art using netpbm tools." ++"\n" ++"The output was very ugly because the converting algorithm was absolutly stupid. " ++"During the night I designed a new convertor that used a font bitmap for " ++"creating aproximation table. The output wasn't very good since the algorithm " ++"wasn't so well tuned. Many months this small piece of code was waiting on my " ++"disc for the day \"D\". Meanwhile I started a new project XaoS (a fractal zoomer) " ++"with my friend Thomas. And then I got an idea: Ascii Art Mandelbrots! " ++"I was really impressed by the result! XaoS was faster, portable and looking " ++"much better than ever before. I found a new way to go... " + "#c\n" + "#f\n" + "\n" diff --git a/packages/e17/e-wm_0.16.999.036.bb b/packages/e17/e-wm_0.16.999.037.bb index 3084fd99bc..3084fd99bc 100644 --- a/packages/e17/e-wm_0.16.999.036.bb +++ b/packages/e17/e-wm_0.16.999.037.bb diff --git a/packages/e17/entrance/Sessions/Enlightenment b/packages/e17/entrance/Sessions/Enlightenment index 4d33bbb2e9..61498c2c6c 100644 --- a/packages/e17/entrance/Sessions/Enlightenment +++ b/packages/e17/entrance/Sessions/Enlightenment @@ -1,4 +1,3 @@ #!/bin/sh -enlightenment - +enlightenment_start diff --git a/packages/e17/entrance_0.9.0.007.bb b/packages/e17/entrance_0.9.0.007.bb index 7f0a9a181e..50126cb5a9 100644 --- a/packages/e17/entrance_0.9.0.007.bb +++ b/packages/e17/entrance_0.9.0.007.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Entrance is the Enlightenment login manager" LICENSE = "MIT" # can also use pam and crypt -DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch xserver-common login-manager" +DEPENDS = "evas-x11 ecore-x11 edje esmart-x11 bash keylaunch xserver-common login-manager" RDEPENDS += "bash keylaunch xserver-common glibc-gconv-iso8859-1 login-manager entrance-themes" HOMEPAGE = "http://www.enlightenment.org" -PR = "r13" +PR = "r14" inherit e diff --git a/packages/efl/ecore-fb_0.9.9.036.bb b/packages/efl/ecore-fb_0.9.9.037.bb index 49c32927af..b856d38bd9 100644 --- a/packages/efl/ecore-fb_0.9.9.036.bb +++ b/packages/efl/ecore-fb_0.9.9.037.bb @@ -1,6 +1,8 @@ require ecore.inc PR = "r2" +SRC_URI += "file://remove-bad-code.patch;patch=1" + EXTRA_OECONF = "--enable-ecore-fb \ --enable-ecore-job \ --enable-ecore-file \ diff --git a/packages/efl/ecore-native_0.9.9.036.bb b/packages/efl/ecore-native_0.9.9.037.bb index 7d7ed2370a..7d7ed2370a 100644 --- a/packages/efl/ecore-native_0.9.9.036.bb +++ b/packages/efl/ecore-native_0.9.9.037.bb diff --git a/packages/efl/ecore-x11_0.9.9.036.bb b/packages/efl/ecore-x11_0.9.9.037.bb index 1deb641326..1deb641326 100644 --- a/packages/efl/ecore-x11_0.9.9.036.bb +++ b/packages/efl/ecore-x11_0.9.9.037.bb diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc index e0e65b69c0..7d89435598 100644 --- a/packages/efl/ecore.inc +++ b/packages/efl/ecore.inc @@ -3,7 +3,7 @@ foundation libraries. It makes makes doing selections, drag and drop, event loop timeouts and idle handlers fast, optimized, and convenient." LEAD_SONAME = "libecore.so" LICENSE = "MIT" -# can also have openssl, dbus +# can also have openssl, dbus, iconv DEPENDS += "virtual/evas curl eet" PROVIDES += "virtual/ecore" diff --git a/packages/efl/ecore/fix-tslib-configure.patch b/packages/efl/ecore/fix-tslib-configure.patch index 5a23f904dc..2c82b2741e 100644 --- a/packages/efl/ecore/fix-tslib-configure.patch +++ b/packages/efl/ecore/fix-tslib-configure.patch @@ -1,12 +1,12 @@ -diff -Nur ecore-0.9.9.015~/configure.in ecore-0.9.9.015/configure.in ---- ecore-0.9.9.015~/configure.in 2005-09-27 17:22:38.000000000 -0700 -+++ ecore-0.9.9.015/configure.in 2005-09-27 17:23:40.000000000 -0700 -@@ -103,7 +102,7 @@ - tslib_libs="" - AC_CHECK_HEADER(tslib.h, - [ -- tslib_libs="-ltslib" -+ tslib_libs="-lts" - AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_X Module]) - ],[ - AC_MSG_RESULT("No tslib header found. No tslib support being built") +diff -Nur ecore-0.9.9.037~/configure.in ecore-0.9.9.037/configure.in +--- ecore-0.9.9.037~/configure.in 2007-01-14 20:21:42.000000000 -0800 ++++ ecore-0.9.9.037/configure.in 2007-01-14 20:22:18.000000000 -0800 +@@ -578,7 +578,7 @@ + if test "x$want_ecore_fb" = "xyes"; then + AC_CHECK_HEADER(tslib.h, + [ +- tslib_libs="-ltslib" ++ tslib_libs="-lts" + AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code]) + ] + ) diff --git a/packages/efl/edb-native/.mtn2git_empty b/packages/efl/edb-native/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/efl/edb-native/.mtn2git_empty diff --git a/packages/efl/edb-native/no-gtk-forkbomb.patch b/packages/efl/edb-native/no-gtk-forkbomb.patch new file mode 100644 index 0000000000..8fe226846e --- /dev/null +++ b/packages/efl/edb-native/no-gtk-forkbomb.patch @@ -0,0 +1,12 @@ +diff -Nur edb-1.0.5.007~/configure.in edb-1.0.5.007/configure.in +--- edb-1.0.5.007~/configure.in 2007-01-15 01:01:31.000000000 -0800 ++++ edb-1.0.5.007/configure.in 2007-01-15 01:01:40.000000000 -0800 +@@ -404,7 +404,7 @@ + ncurses_ok=no + gtk_ok=no + +-GTK_CONFIG=`which gtk-config` ++GTK_CONFIG= + if test -x "$GTK_CONFIG"; then + AC_CHECK_LIB(gtk, gtk_init, gtk_ok=yes, gtk_ok=no, `$GTK_CONFIG --libs`) + fi diff --git a/packages/efl/edb-native_1.0.5.007.bb b/packages/efl/edb-native_1.0.5.007.bb index 82095f03cc..f3f94086ce 100644 --- a/packages/efl/edb-native_1.0.5.007.bb +++ b/packages/efl/edb-native_1.0.5.007.bb @@ -2,6 +2,8 @@ require edb_${PV}.bb inherit native DEPENDS = "zlib-native" +SRC_URI += "file://no-gtk-forkbomb.patch;patch=1" + EXTRA_OECONF += "--disable-gtk --disable-ncurses" do_stage_append () { diff --git a/packages/efl/edb_1.0.5.007.bb b/packages/efl/edb_1.0.5.007.bb index a152530b47..9632fc4acc 100644 --- a/packages/efl/edb_1.0.5.007.bb +++ b/packages/efl/edb_1.0.5.007.bb @@ -1,6 +1,7 @@ DESCRIPTION = "EDB is a database convenience library wrapped around the \ Berkeley DB 2.7.7 by Sleepycat Software." DEPENDS = "zlib ncurses" +# can depend on gtk and tcl/tk LICENSE = "BSD" PR = "r4" diff --git a/packages/efl/edje-native_0.5.0.036.bb b/packages/efl/edje-native_0.5.0.037.bb index c66639d25e..c66639d25e 100644 --- a/packages/efl/edje-native_0.5.0.036.bb +++ b/packages/efl/edje-native_0.5.0.037.bb diff --git a/packages/efl/edje-utils_0.5.0.036.bb b/packages/efl/edje-utils_0.5.0.037.bb index f8eb917e4d..f8eb917e4d 100644 --- a/packages/efl/edje-utils_0.5.0.036.bb +++ b/packages/efl/edje-utils_0.5.0.037.bb diff --git a/packages/efl/edje_0.5.0.036.bb b/packages/efl/edje_0.5.0.037.bb index d51dd119e4..d51dd119e4 100644 --- a/packages/efl/edje_0.5.0.036.bb +++ b/packages/efl/edje_0.5.0.037.bb diff --git a/packages/efl/eet-native_0.9.10.036.bb b/packages/efl/eet-native_0.9.10.037.bb index 9e2426ca9f..9e2426ca9f 100644 --- a/packages/efl/eet-native_0.9.10.036.bb +++ b/packages/efl/eet-native_0.9.10.037.bb diff --git a/packages/efl/eet_0.9.10.036.bb b/packages/efl/eet_0.9.10.037.bb index 6e6032e098..6e6032e098 100644 --- a/packages/efl/eet_0.9.10.036.bb +++ b/packages/efl/eet_0.9.10.037.bb diff --git a/packages/efl/embryo-native_0.9.1.036.bb b/packages/efl/embryo-native_0.9.1.037.bb index 76fe80fe3d..76fe80fe3d 100644 --- a/packages/efl/embryo-native_0.9.1.036.bb +++ b/packages/efl/embryo-native_0.9.1.037.bb diff --git a/packages/efl/embryo-utils_0.9.1.036.bb b/packages/efl/embryo-utils_0.9.1.037.bb index d507c53cce..d507c53cce 100644 --- a/packages/efl/embryo-utils_0.9.1.036.bb +++ b/packages/efl/embryo-utils_0.9.1.037.bb diff --git a/packages/efl/embryo_0.9.1.036.bb b/packages/efl/embryo_0.9.1.037.bb index 0009c0a149..0009c0a149 100644 --- a/packages/efl/embryo_0.9.1.036.bb +++ b/packages/efl/embryo_0.9.1.037.bb diff --git a/packages/efl/evas-fb_0.9.9.036.bb b/packages/efl/evas-fb_0.9.9.037.bb index 3e29b80cc0..3e29b80cc0 100644 --- a/packages/efl/evas-fb_0.9.9.036.bb +++ b/packages/efl/evas-fb_0.9.9.037.bb diff --git a/packages/efl/evas-native_0.9.9.036.bb b/packages/efl/evas-native_0.9.9.037.bb index 68dacbc809..68dacbc809 100644 --- a/packages/efl/evas-native_0.9.9.036.bb +++ b/packages/efl/evas-native_0.9.9.037.bb diff --git a/packages/efl/evas-x11_0.9.9.036.bb b/packages/efl/evas-x11_0.9.9.037.bb index 121922591e..121922591e 100644 --- a/packages/efl/evas-x11_0.9.9.036.bb +++ b/packages/efl/evas-x11_0.9.9.037.bb diff --git a/packages/efl/evas/fix-configure.patch b/packages/efl/evas/fix-configure.patch index 61e2446c24..abf9b94bdf 100644 --- a/packages/efl/evas/fix-configure.patch +++ b/packages/efl/evas/fix-configure.patch @@ -1,17 +1,18 @@ ---- evas-0.9.9.023/configure.in~ 2006-01-11 21:34:57.000000000 -0800 -+++ evas-0.9.9.023/configure.in 2006-02-03 12:15:45.000000000 -0800 -@@ -152,9 +152,7 @@ +diff -Nur evas-0.9.9.037~/configure.in evas-0.9.9.037/configure.in +--- evas-0.9.9.037~/configure.in 2007-01-14 20:09:57.000000000 -0800 ++++ evas-0.9.9.037/configure.in 2007-01-14 20:11:09.000000000 -0800 +@@ -161,9 +161,7 @@ + AC_CHECK_HEADER(X11/X.h, [ - AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, true) AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend]) - x_dir=${x_dir:-/usr/X11R6} - x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" + x_libs="-lX11 -lXext" - ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test evas_software_x11_perf_test evas_software_x11_perf_load" ], [ -@@ -423,10 +421,10 @@ + AC_MSG_RESULT(disabling software X11 engine) +@@ -407,10 +405,10 @@ AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true) AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) @@ -23,8 +24,8 @@ + gl_cflags="" gl_libs="-lGL -lGLU -lpthread" gl_dir="" - ENGINE_GL_X11_PRG="evas_gl_x11_test" -@@ -489,7 +487,7 @@ + ], [ +@@ -471,7 +469,7 @@ AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend]) AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true) AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support]) @@ -32,4 +33,4 @@ + x_dir=""; x_cflags="-I"$x_dir"/include" x_libs="-L"$x_dir"/lib -lX11 -lXext" - ENGINE_CAIRO_X11_PRG="evas_cairo_x11_test" + ], [ diff --git a/packages/gnome/gnome-vfs_2.16.3.bb b/packages/gnome/gnome-vfs_2.16.3.bb index 6efbe7249d..0c6176428e 100644 --- a/packages/gnome/gnome-vfs_2.16.3.bb +++ b/packages/gnome/gnome-vfs_2.16.3.bb @@ -2,13 +2,13 @@ LICENSE = "GPL" DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib" RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info" -PR = "r1" +PR = "r2" inherit gnome # This is to provide compatibility with the gnome-vfs DBus fork PROVIDES = "gnome-vfs-plugin-dbus" -RRPEPLACES = "gnome-vfs-dbus" +RREPLACES = "gnome-vfs-dbus" SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \ file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0" diff --git a/packages/musicpd/mpd/fix-mod-support.patch b/packages/musicpd/mpd/fix-mod-support.patch new file mode 100644 index 0000000000..f9010abd9b --- /dev/null +++ b/packages/musicpd/mpd/fix-mod-support.patch @@ -0,0 +1,23 @@ +Index: mpd/src/inputPlugins/mod_plugin.c +=================================================================== +--- mpd.orig/src/inputPlugins/mod_plugin.c ++++ mpd/src/inputPlugins/mod_plugin.c +@@ -62,10 +62,16 @@ static MDRIVER drv_mpd = { + NULL, + "MPD", + "MPD Output Driver v0.1", ++ + 0, + 255, +- "mpd", +- NULL, ++#if (LIBMIKMOD_VERSION > 0x030106) ++ "mpd", /* alias */ ++ NULL, /* cmd help line*/ ++#endif ++#if (LIBMIKMOD_VERSION >= 0x030200) ++ NULL, /*Command Line */ ++#endif + mod_mpd_IsThere, + VC_SampleLoad, + VC_SampleUnload, diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb index bc10a923fb..3478bc76fa 100644 --- a/packages/musicpd/mpd_svn.bb +++ b/packages/musicpd/mpd_svn.bb @@ -2,12 +2,13 @@ DESCRIPTION = "Music Player Daemon (mpd)" HOMEPAGE = "http://www.musicpd.org" LICENSE = "GPLv2" SECTION = "console/multimedia" -DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2" +DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio" SRCDATE = "20070120" PV = "0.12.1+svn${SRCDATE}" -PR = "r0" +PR = "r2" -SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https" +SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \ + file://fix-mod-support.patch;patch=1" # file://save-volume-state.patch;patch=1" S = "${WORKDIR}/trunk" @@ -26,7 +27,7 @@ EXTRA_OECONF = "--enable-ogg \ --with-faad-libraries=${STAGING_LIBDIR} \ --with-faad-includes=${STAGING_INCDIR} \ --disable-jack \ - --disable-pulse \ + --enable-pulse \ --enable-mod \ --disable-oggflac" diff --git a/packages/xaos/.mtn2git_empty b/packages/xaos/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xaos/.mtn2git_empty diff --git a/packages/xaos/files/.mtn2git_empty b/packages/xaos/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xaos/files/.mtn2git_empty diff --git a/packages/xaos/files/fix-aalib-configure.patch b/packages/xaos/files/fix-aalib-configure.patch new file mode 100644 index 0000000000..120d85b6fe --- /dev/null +++ b/packages/xaos/files/fix-aalib-configure.patch @@ -0,0 +1,81 @@ +Index: XaoS-3.2.3/configure.in +=================================================================== +--- XaoS-3.2.3.orig/configure.in ++++ XaoS-3.2.3/configure.in +@@ -130,25 +130,7 @@ if test -z "`${CC-cc} -mno-ieee-fp -c co + rm -f conftest* + ])]) + +-AC_DEFUN(AC_PROG_AALIB_VER_OK, +-[AC_CACHE_CHECK(whether aalib version >= 1.4, ac_aalib_ver_ok, +-[echo '#include <aalib.h> +-#include <aalib.h> +-void f(){ +-#if AA_LIB_VERSIONCODE < 104000 +-#error aa_lib is probably buggy +-/* I am using SuSE 7.3 and 8.0. Both contains version 1.3, +- * however they report 102000 version code. +- */ +-#endif +-}' > conftest.c +-if test -z "`${CC-cc} -c conftest.c 2>&1`"; then +- ac_aalib_ver_ok=yes +- else +- ac_aalib_ver_ok=no +- fi +- rm -f conftest* +-])]) ++ac_aalib_ver_ok=yes + + AC_DEFUN(PROG_CC_SWITCH1, + [AC_CACHE_CHECK(whether ${CC-cc} accepts -$1, ac_$2, +@@ -478,7 +460,6 @@ AC_DEFUN(AC_AALIB, [ + AC_CHECK_LIB(aa, aa_init) + if test "x$ac_cv_lib_aa_aa_init" = xyes; then + AC_MSG_RESULT(Found aalib on $1/aalib.h) +- AC_PROG_AALIB_VER_OK + if test $ac_aalib_ver_ok = yes; then + #LIBS="$LIBS $2" + x11_linked=yes +@@ -616,22 +597,22 @@ if test "$aa_driver_test" = yes; then + dnl Replace `main' with a function in -lm: + AC_CHECK_LIB(slang, SLsmg_init_smg) + +- AC_NCURSES(/usr/include, ncurses.h, , -I/usr/include/ncurses , "ncurses on /usr/include") +- AC_NCURSES(/usr/include/ncurses, ncurses.h, , -I/usr/include/ncurses, "ncurses on /usr/include/ncurses") +- AC_NCURSES(/usr/local/include, ncurses.h, ,-L/usr/local/lib, -I/usr/local/include, "ncurses on /usr/local") +- AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, ncurses.h, , -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses , "ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, ncurses.h, , -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, "ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, ncurses.h, ,-L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, "ncurses on /usr/local") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, ncurses.h, -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib/ncurses, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, "ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses") + +- AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, curses.h, -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses") + +- AC_NCURSES(/usr/include/ncurses, curses.h, , -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses") +- AC_CURSES(/usr/include, curses.h, , , "curses on /usr/include") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, curses.h, , -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses") ++ AC_CURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, curses.h, , , "curses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include") + + dnl + dnl We couldn't find ncurses, try SysV curses + dnl + if $search_ncurses + then +- AC_EGREP_HEADER(init_color, /usr/include/curses.h, ++ AC_EGREP_HEADER(init_color, /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/curses.h, + AC_USE_SYSV_CURSES) + fi + +@@ -653,8 +634,8 @@ if test "$aa_driver_test" = yes; then + LIBS="$LIBS $X_EXTRA_LIBS $X_LIBS" + CFLAGS="$CFLAGS $X_CFLAGS" + fi +- AC_AALIB(/usr/include, , ) +- AC_AALIB(/usr/local/include, -L/usr/local/lib, -I/usr/local/include) ++ AC_AALIB(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, , ) ++ AC_AALIB(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include) + for name in ../aalib-*.* + do + AC_AALIB($name,"-L$name","-I$name") diff --git a/packages/xaos/files/fix-build.patch b/packages/xaos/files/fix-build.patch new file mode 100644 index 0000000000..064c0fb853 --- /dev/null +++ b/packages/xaos/files/fix-build.patch @@ -0,0 +1,61 @@ +Index: XaoS-3.2.3/src/util/xstdio.c +=================================================================== +--- XaoS-3.2.3.orig/src/util/xstdio.c ++++ XaoS-3.2.3/src/util/xstdio.c +@@ -1,3 +1,4 @@ ++#define DATAPATH "/usr/share/XaoS" + #ifndef _plan9_ + #include <string.h> + #if defined(__EMX__) || defined(__APPLE__) +Index: XaoS-3.2.3/src/engine/formulas.c +=================================================================== +--- XaoS-3.2.3.orig/src/engine/formulas.c ++++ XaoS-3.2.3/src/engine/formulas.c +@@ -69,6 +69,8 @@ + #endif + + ++#include "../include/complex.h" ++ + CONST char *CONST incolorname[] = { + "0", + "zmag", +Index: XaoS-3.2.3/src/engine/plane.c +=================================================================== +--- XaoS-3.2.3.orig/src/engine/plane.c ++++ XaoS-3.2.3/src/engine/plane.c +@@ -53,6 +53,8 @@ CONST char *CONST planename[] = { + }; + + ++#include "../include/complex.h" ++ + REGISTERS (3) + void recalculate (int plane, number_t * x1, number_t * y1) + { +Index: XaoS-3.2.3/src/engine/fractal.c +=================================================================== +--- XaoS-3.2.3.orig/src/engine/fractal.c ++++ XaoS-3.2.3/src/engine/fractal.c +@@ -66,6 +66,8 @@ + #endif + #include <xerror.h> + ++#include "../include/complex.h" ++ + struct symetryinfo2 cursymetry; + struct palette cpalette; + struct image cimage; +Index: XaoS-3.2.3/src/engine/zoom.c +=================================================================== +--- XaoS-3.2.3.orig/src/engine/zoom.c ++++ XaoS-3.2.3/src/engine/zoom.c +@@ -69,6 +69,8 @@ + #define gettext(STRING) STRING + #endif + ++#include "../include/complex.h" ++ + #define ASIZE 16 + #define ALIGN(x) (((x)+ASIZE-1)&(~(ASIZE-1))) + static int nsymetrized; diff --git a/packages/xaos/xaos_3.2.3.bb b/packages/xaos/xaos_3.2.3.bb new file mode 100644 index 0000000000..22cedeb296 --- /dev/null +++ b/packages/xaos/xaos_3.2.3.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "GNU XaoS, a realtime fractal generator zoomer" +HOMEPAGE = "http://wmi.math.u-szeged.hu/xaos/doku.php" +SECTION = "graphics" +LICENSE = "GPLv2" +DEPENDS = "aalib libx11 zlib libpng" +RDEPENDS += "libxxf86dga" +PR = "r0" + +SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.3.tar.gz \ + file://fix-build.patch;patch=1 \ + file://fix-aalib-configure.patch;patch=1" + +S = "${WORKDIR}/XaoS-${PV}" + +inherit autotools + +EXTRA_OECONF = "--disable-nls" +#--with-x --with-ncurses=${STAGING_INCDIR} --with-dga-driver=no --with-x11-driver=no --with-aa-driver=yes + +do_configure_prepend() { + sed -i 's~/usr/include~${STAGING_INCDIR}~' ${S}/configure.in + sed -i 's~/usr/local/include~${STAGING_INCDIR}~' ${S}/configure.in + sed -i 's~/usr/lib~${STAGING_LIBDIR}~' ${S}/configure.in + sed -i 's~/usr/local/lib~${STAGING_LIBDIR}~' ${S}/configure.in +} + +FILES_${PN} = "${bindir} ${datadir}/XaoS/catalogs" + +CFLAGS = "-L${STAGING_LIBDIR}" |