summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/musicpd/mpc_0.11.2.bb11
-rw-r--r--packages/musicpd/mpc_0.12.1.bb (renamed from packages/musicpd/mpc_0.12.0.bb)0
-rw-r--r--packages/musicpd/mpd_0.11.2.bb22
-rw-r--r--packages/musicpd/mpd_0.11.5.bb32
-rw-r--r--packages/musicpd/mpd_svn.bb11
-rw-r--r--packages/openmoko2/openmoko-common2_svn.bb7
-rw-r--r--packages/openmoko2/openmoko-session2.bb6
7 files changed, 14 insertions, 75 deletions
diff --git a/packages/musicpd/mpc_0.11.2.bb b/packages/musicpd/mpc_0.11.2.bb
deleted file mode 100644
index 8d3eaa183a..0000000000
--- a/packages/musicpd/mpc_0.11.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client"
-HOMEPAGE = "http://www.musicpd.org/mpc.shtml"
-SECTION = "console/multimedia"
-LICENSE = "GPLv2"
-PR = "r1"
-
-SRC_URI = "http://mercury.chem.pitt.edu/~shank/mpc-${PV}.tar.gz"
-EXTRA_OECONF = "--with-iconv-libraries=${STAGING_LIBDIR} \
- --with-iconv-includes=${STAGING_INCDIR}"
-
-inherit autotools
diff --git a/packages/musicpd/mpc_0.12.0.bb b/packages/musicpd/mpc_0.12.1.bb
index ccd6926fcd..ccd6926fcd 100644
--- a/packages/musicpd/mpc_0.12.0.bb
+++ b/packages/musicpd/mpc_0.12.1.bb
diff --git a/packages/musicpd/mpd_0.11.2.bb b/packages/musicpd/mpd_0.11.2.bb
deleted file mode 100644
index 9d3c5f90b0..0000000000
--- a/packages/musicpd/mpd_0.11.2.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Music Player Daemon (mpd)"
-HOMEPAGE = "http://www.musicpd.org"
-SECTION = "console/multimedia"
-LICENSE = "GPLv2"
-DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile"
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz"
-
-inherit autotools
-
-# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
-# be built, instead we use the OE built versions which should be installed
-# in staging - remove the --with and replace with --enable to use the local
-# versions.
-
-EXTRA_OECONF = "--enable-ogg \
- --with-id3tag-libraries=${STAGING_LIBDIR} \
- --with-id3tag-includes=${STAGING_INCDIR} \
- --with-mad-libraries=${STAGING_LIBDIR} \
- --with-mad-includes=${STAGING_INCDIR} \
- --without-faad"
diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb
deleted file mode 100644
index 7a1d17ef5d..0000000000
--- a/packages/musicpd/mpd_0.11.5.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Music Player Daemon (mpd)"
-HOMEPAGE = "http://www.musicpd.org"
-SECTION = "console/multimedia"
-LICENSE = "GPLv2"
-DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2"
-PR = "r8"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \
- file://save-volume-state.patch;patch=1"
-
-inherit autotools
-
-# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
-# be built, instead we use the OE built versions which should be installed
-# in staging - remove the --with and replace with --enable to use the local
-# versions.
-
-EXTRA_OECONF = "--enable-ogg \
- --with-iconv-libraries=${STAGING_LIBDIR} \
- --with-iconv-includes=${STAGING_INCDIR} \
- --with-vorbis-libraries=${STAGING_LIBDIR} \
- --with-vorbis-includes=${STAGING_INCDIR} \
- --with-ogg-libraries=${STAGING_LIBDIR} \
- --with-ogg-includes=${STAGING_INCDIR} \
- --with-ao-libraries=${STAGING_LIBDIR} \
- --with-ao-includes=${STAGING_INCDIR} \
- --with-id3tag-libraries=${STAGING_LIBDIR} \
- --with-id3tag-includes=${STAGING_INCDIR} \
- --with-mad-libraries=${STAGING_LIBDIR} \
- --with-mad-includes=${STAGING_INCDIR} \
- --with-faad-libraries=${STAGING_LIBDIR} \
- --with-faad-includes=${STAGING_INCDIR}"
diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb
index 04ddf8fdc3..673ff03b98 100644
--- a/packages/musicpd/mpd_svn.bb
+++ b/packages/musicpd/mpd_svn.bb
@@ -3,23 +3,24 @@ HOMEPAGE = "http://www.musicpd.org"
SECTION = "console/multimedia"
LICENSE = "GPLv2"
DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio"
-SRCDATE = "20070120"
PV = "0.12.1+svn${SRCDATE}"
-PR = "r2"
+PR = "r0"
SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \
- file://fix-mod-support.patch;patch=1;maxdate=20070302"
+ file://mpd/mpd.init"
# file://save-volume-state.patch;patch=1"
S = "${WORKDIR}/trunk"
-inherit autotools
+inherit autotools update-rc.d
+INITSCRIPT_NAME = "mpd"
# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
# be built, instead we use the OE built versions which should be installed
# in staging - remove the --with and replace with --enable to use the local
# versions.
-EXTRA_OECONF = "--enable-ogg \
+EXTRA_OECONF = "\
+ --enable-ogg \
--with-id3tag-libraries=${STAGING_LIBDIR} \
--with-id3tag-includes=${STAGING_INCDIR} \
--with-mad-libraries=${STAGING_LIBDIR} \
diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb
index 11738f76f1..f54a23de18 100644
--- a/packages/openmoko2/openmoko-common2_svn.bb
+++ b/packages/openmoko2/openmoko-common2_svn.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Common files for the OpenMoko distribution"
SECTION = "openmoko/base"
PV = "0.0+svn${SRCDATE}"
-PR = "r1"
+PR = "r3"
inherit openmoko2
@@ -12,10 +12,11 @@ dirs = "pixmaps"
do_install() {
find ${WORKDIR} -name ".svn" | xargs rm -rf
- install -d ${D}${datadir}/openmoko/
+ install -d ${D}${datadir}
for i in ${dirs}; do
- cp -fpPR ${S}/$i ${D}${datadir}/openmoko/
+ cp -fpPR ${S}/$i ${D}${datadir}
done
}
+PACKAGE_ARCH = "all"
FILES_${PN} = "${datadir}"
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 418993f079..046f59b3d9 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Custom MB session files for OpenMoko"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
-RDEPENDS+= "openmoko-common2 openmoko-today2 openmoko-dialer2"
+RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
RCONFLICTS = "openmoko-session"
-PR = "r28"
+PR = "r29"
SRC_URI = "file://etc"
S = ${WORKDIR}
@@ -29,3 +29,5 @@ gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --dire
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
}
+
+PACKAGE_ARCH = "all"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-21 16:56:36 +0000