diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/libchm/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/libchm/chmlib_0.38.bb | 11 | ||||
-rw-r--r-- | packages/libchm/files/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/libchm/files/arm-guess.patch | 12 | ||||
-rw-r--r-- | packages/madwifi/files/10-xscale-be-elf-copts.patch | 10 | ||||
-rw-r--r-- | packages/madwifi/files/10-xscale-le-elf-copts.patch | 6 | ||||
-rw-r--r-- | packages/madwifi/madwifi-ng_r1692-20060723.bb | 2 | ||||
-rw-r--r-- | packages/man/man_1.5p.bb | 4 | ||||
-rw-r--r-- | packages/mikmod/mikmod_3.2.2-beta1.bb | 2 | ||||
-rw-r--r-- | packages/pcre/pcre_4.4.bb | 4 | ||||
-rw-r--r-- | packages/xmms/files/acinclude.m4 | 36 | ||||
-rw-r--r-- | packages/xmms/files/xmms-config-dequote.patch | 25 | ||||
-rw-r--r-- | packages/xmms/xmms-mad_0.10.bb | 15 | ||||
-rw-r--r-- | packages/xmms/xmms-tremor_1.0.bb | 12 | ||||
-rw-r--r-- | packages/xmms/xmms_1.2.10.bb | 29 |
15 files changed, 144 insertions, 24 deletions
diff --git a/packages/libchm/.mtn2git_empty b/packages/libchm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libchm/.mtn2git_empty diff --git a/packages/libchm/chmlib_0.38.bb b/packages/libchm/chmlib_0.38.bb new file mode 100644 index 0000000000..4b44b7ce57 --- /dev/null +++ b/packages/libchm/chmlib_0.38.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "CHMLIB is a library for dealing with Microsoft ITSS/CHM format files." +LICENSE = "GPLv2" +HOMEPAGE = "http://66.93.236.84/~jedwin/projects/chmlib/" + +SRC_URI = "http://66.93.236.84/~jedwin/projects/chmlib/${P}.tar.bz2 \ + file://arm-guess.patch;patch=1" + +inherit autotools pkgconfig + + + diff --git a/packages/libchm/files/.mtn2git_empty b/packages/libchm/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libchm/files/.mtn2git_empty diff --git a/packages/libchm/files/arm-guess.patch b/packages/libchm/files/arm-guess.patch new file mode 100644 index 0000000000..b524c81aac --- /dev/null +++ b/packages/libchm/files/arm-guess.patch @@ -0,0 +1,12 @@ +--- /tmp/chm_lib.c 2006-08-13 12:29:15.000000000 +0200 ++++ chmlib-0.38/src/chm_lib.c 2006-08-13 12:29:43.148306000 +0200 +@@ -160,7 +160,8 @@ + /* Sparc */ + /* MIPS */ + /* PPC */ +-#elif __i386__ || __sun || __sgi || __ppc__ ++/* ARM */ ++#elif __i386__ || __sun || __sgi || __ppc__ || __arm__ + typedef unsigned char UChar; + typedef short Int16; + typedef unsigned short UInt16; diff --git a/packages/madwifi/files/10-xscale-be-elf-copts.patch b/packages/madwifi/files/10-xscale-be-elf-copts.patch index e3158c045c..84915e03e2 100644 --- a/packages/madwifi/files/10-xscale-be-elf-copts.patch +++ b/packages/madwifi/files/10-xscale-be-elf-copts.patch @@ -1,8 +1,10 @@ --- madwifi-ng/hal/public/xscale-be-elf.inc~ 2006-02-11 22:34:39.000000000 +1030 +++ madwifi-ng/hal/public/xscale-be-elf.inc 2006-04-12 06:10:47.736463272 +0930 -@@ -73,4 +73,4 @@ +@@ -77,5 +77,5 @@ + LDOPTS= -EB - COPTS+= -DAH_BYTE_ORDER=AH_BIG_ENDIAN -DAH_REGOPS_FUNC - COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \ + COPTS+= -DAH_BYTE_ORDER=AH_BIG_ENDIAN +-COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \ - -mtune=xscale -mshort-load-bytes -msoft-float -mfp=2 -+ -mtune=xscale -malignment-traps -msoft-float -mfp=2 ++COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common \ ++ -mtune=xscale -msoft-float -mfp=2 diff --git a/packages/madwifi/files/10-xscale-le-elf-copts.patch b/packages/madwifi/files/10-xscale-le-elf-copts.patch index 393167c165..7ab46e16b3 100644 --- a/packages/madwifi/files/10-xscale-le-elf-copts.patch +++ b/packages/madwifi/files/10-xscale-le-elf-copts.patch @@ -1,8 +1,8 @@ --- madwifi-ng/hal/public/xscale-le-elf.inc~ 2006-04-12 06:09:56.669226672 +0930 +++ madwifi-ng/hal/public/xscale-le-elf.inc 2006-04-12 05:52:11.658132968 +0930 -@@ -74,4 +74,4 @@ +@@ -79,4 +79,4 @@ LDOPTS= -EL - COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN -DAH_REGOPS_FUNC + COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \ - -mapcs-32 -mtune=xscale -mshort-load-bytes -msoft-float -mfp=2 -+ -mapcs-32 -mtune=xscale -malignment-traps -msoft-float -mfp=2 ++ -mtune=xscale -msoft-float -mfp=2 diff --git a/packages/madwifi/madwifi-ng_r1692-20060723.bb b/packages/madwifi/madwifi-ng_r1692-20060723.bb index 84af37257d..6268f2b78f 100644 --- a/packages/madwifi/madwifi-ng_r1692-20060723.bb +++ b/packages/madwifi/madwifi-ng_r1692-20060723.bb @@ -1,2 +1,2 @@ require madwifi-ng_r.inc -PR="r0" +PR="r1" diff --git a/packages/man/man_1.5p.bb b/packages/man/man_1.5p.bb index fa4b318956..c2e0e829ce 100644 --- a/packages/man/man_1.5p.bb +++ b/packages/man/man_1.5p.bb @@ -4,7 +4,7 @@ MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>" DESCRIPTION = "The man page suite, including man, apropos, \ and whatis consists of programs that are used to read most \ of the documentation available on a Linux system." -PR = "r2" +PR = "r3" RDEPENDS_${PN} = "less groff" # Note: The default man.conf uses wrong names for GNU eqn and troff, @@ -37,6 +37,6 @@ do_install() { install -m 644 ${FILESDIR}/man.conf ${D}/etc } -FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ +FILES_${PN} = "${bindir}/* ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ ${libdir}/*/ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ /bin /sbin /lib/*/ /lib/*.so*" diff --git a/packages/mikmod/mikmod_3.2.2-beta1.bb b/packages/mikmod/mikmod_3.2.2-beta1.bb index 79146fb580..76acab9f64 100644 --- a/packages/mikmod/mikmod_3.2.2-beta1.bb +++ b/packages/mikmod/mikmod_3.2.2-beta1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A module player based on libmikmod." SECTION = "console/multimedia" HOMEPAGE = "http://mikmod.raphnet.net" MAINTAINER = "Michael 'Mickey' Lauer" -DEPENDS = "libmikmod" +DEPENDS = "ncurses libmikmod" PR = "r1" LICENSE = "GPL" SRC_URI = "http://mikmod.raphnet.net/files/mikmod-${PV}.tar.bz2 \ diff --git a/packages/pcre/pcre_4.4.bb b/packages/pcre/pcre_4.4.bb index 451d44b17c..7603e11537 100644 --- a/packages/pcre/pcre_4.4.bb +++ b/packages/pcre/pcre_4.4.bb @@ -5,7 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \ themselves still follow Perl syntax and semantics. The header file for \ the POSIX-style functions is called pcreposix.h." SECTION = "devel" -PR = "r5" +PR = "r6" LICENSE = "BSD" SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2" S = "${WORKDIR}/pcre-${PV}" @@ -38,4 +38,4 @@ do_stage () { } FILES_${PN} = "${libdir}/lib*.so*" -FILES_${PN}-dev += "${bindir}" +FILES_${PN}-dev += "${bindir}/*" diff --git a/packages/xmms/files/acinclude.m4 b/packages/xmms/files/acinclude.m4 new file mode 100644 index 0000000000..099d55b0b2 --- /dev/null +++ b/packages/xmms/files/acinclude.m4 @@ -0,0 +1,36 @@ +dnl XMMS_FUNC_POSIX(FUNCTION... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl Test for functions in posix libraries, and define POSIX_LIBS +AC_DEFUN(XMMS_FUNC_POSIX, +[dnl + xmms_posix4=no + xmms_rt=no + for xmms_func in $1 + do + xmms_have_func=no + AC_CHECK_FUNC($xmms_func,xmms_have_func=yes,[ + dnl try in libposix4 if not found in current LIBS + AC_CHECK_LIB(posix4,$xmms_func,[xmms_have_func=yes xmms_posix4=yes],[ + dnl try in librt, if not found so far + AC_CHECK_LIB(rt,$xmms_func,[xmms_have_func=yes xmms_rt=yes]) + ]) + ]) + if test $xmms_have_func = yes; then + changequote(, )dnl + xmms_tr_func=HAVE_`echo $xmms_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + changequote([, ])dnl + AC_DEFINE_UNQUOTED($xmms_tr_func) + ifelse([$2], , :, [$2]) + else + ifelse([$3], , :, [$3]) + fi + done + POSIX_LIBS= + if test $xmms_posix4 = yes; then + POSIX_LIBS=-lposix4 + fi + if test $xmms_rt = yes; then + POSIX_LIBS="$POSIX_LIBS -lrt" + fi + AC_SUBST(POSIX_LIBS) +]) + diff --git a/packages/xmms/files/xmms-config-dequote.patch b/packages/xmms/files/xmms-config-dequote.patch new file mode 100644 index 0000000000..8fdd7f0cf7 --- /dev/null +++ b/packages/xmms/files/xmms-config-dequote.patch @@ -0,0 +1,25 @@ +--- xmms-1.2.10/xmms-config.in.orig 2006-08-13 06:55:56.000000000 +0100 ++++ xmms-1.2.10/xmms-config.in 2006-08-13 06:56:52.000000000 +0100 +@@ -12,15 +12,15 @@ + # + # This work is released under the GNU GPL, version 2 or later. + +-prefix="@prefix@" +-exec_prefix="@exec_prefix@" ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ + exec_prefix_set=no +-data_dir="@datadir@/@PACKAGE@" ++data_dir=@datadir@/@PACKAGE@ + +-version="@VERSION@" +-include_dir="@includedir@" +-xmms_include_dir="@includedir@/@PACKAGE@" +-lib_dir="@libdir@" ++version=@VERSION@ ++include_dir=@includedir@ ++xmms_include_dir=@includedir@/@PACKAGE@ ++lib_dir=@libdir@ + + if ( (gtk-config --version) > /dev/null 2>&1) then + gtk_libs=`gtk-config --libs` diff --git a/packages/xmms/xmms-mad_0.10.bb b/packages/xmms/xmms-mad_0.10.bb new file mode 100644 index 0000000000..6c43d7878f --- /dev/null +++ b/packages/xmms/xmms-mad_0.10.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "xmms plugin for the mad integer mp3 decoder" +SECTION = "x11/multimedia" +HOMEPAGE = "http://xmms-mad.sourceforge.net +MAINTAINER = "Graeme Gregory <dp@xora.org.uk> +LICENSE = "GPL" +DEPENDS = "xmms libmad libid3tag" +SRC_URI = "${SOURCEFORGE_MIRROR}/xmms-mad/xmms-mad-${PV}.tar.bz2" + +inherit autotools + +export XMMS_CONFIG = "${STAGING_BINDIR}/xmms-config" + +FILES_${PN} = "${libdir}/xmms/Input/libxmmsmad.so" +FILES_${PN}-dbg = "${libdir}/xmms/Input/.debug/libxmmsmad.so" + diff --git a/packages/xmms/xmms-tremor_1.0.bb b/packages/xmms/xmms-tremor_1.0.bb new file mode 100644 index 0000000000..d6619d4d97 --- /dev/null +++ b/packages/xmms/xmms-tremor_1.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "xmms plugin for the tremos integer vorbis decoder" +SECTION = "x11/multimedia" +MAINTAINER = "Graeme Gregory <dp@xora.org.uk> +LICENSE = "GPL" +DEPENDS = "xmms tremor" +SRC_URI = "http://mirror1.pdaxrom.org/source/src/xmms-tremor-1.0.tar.bz2" + +inherit autotools + +FILES_${PN} = "${libdir}/xmms/Input/libxmmstremor.so" +FILES_${PN}-dbg = "${libdir}/xmms/Input/.debug/libxmmstremor.so" + diff --git a/packages/xmms/xmms_1.2.10.bb b/packages/xmms/xmms_1.2.10.bb index 05bfb1dc3e..5f50534cf5 100644 --- a/packages/xmms/xmms_1.2.10.bb +++ b/packages/xmms/xmms_1.2.10.bb @@ -2,22 +2,29 @@ DESCRIPTION = "The X MultiMedia System" HOMEPAGE = "http://www.xmms.org/" LICENSE = "GPL" SECTION = "x11/multimedia" -# TODO add esd mikmod vorbis -DEPENDS = "gtk+-1.2" +# TODO add esd +DEPENDS = "gtk+-1.2 libvorbis mikmod" SRC_URI = "http://www.xmms.org/files/1.2.x/xmms-${PV}.tar.bz2 \ - file://gcc4.patch;patch=1" + file://gcc4.patch;patch=1 \ + file://xmms-config-dequote.patch;patch=1 \ + file://acinclude.m4" +PR = "r1" -inherit autotools +inherit autotools binconfig -# TODO enable esd mikmod vorbis -EXTRA_OECONF = "--disable-opengl --disable-esd --disable-mikmod --disable-vorbis" +# TODO enable esd +EXTRA_OECONF = "--disable-opengl --disable-esd \ + --with-vorbis-includes=${STAGING_INCDIR} \ + --with-ogg-includes=${STAGING_INCDIR} \ + --with-vorbis-libraries=${STAGING_LIBDIR} \ + --with-ogg-libraries=${STAGING_LIBDIR}" -do_configure() { - oe_runconf +do_configure_prepend() { + cp ${WORKDIR}/acinclude.m4 ${S} + rm ${S}/libxmms/acinclude.m4 } -do_compile() { - oe_runmake LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool +do_stage() { + autotools_stage_all } - |