From 791a9bc3f0fbcd4f44bda9dc7cd6cfaa709aefa0 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Wed, 1 Apr 2009 22:54:56 +0200 Subject: angstrom-2008.1.conf: add PREFERRED_VERSION_psplash -Acked-by: Koen Kooi --- conf/distro/angstrom-2008.1.conf | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 57048d66a5..6c2c1bd5ab 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -76,6 +76,15 @@ PREFERRED_VERSION_glibc-initial ?= "2.6.1" PREFERRED_VERSION_uclibc ?= "0.9.30" PREFERRED_VERSION_uclibc-initial ?= "0.9.30" +# Preferred version for psplash +# This enforces a specific brand to be used, in our case the angstrom +# one. In case you want to change the logo or something like that we +# suggest you to create another recipe (e.g: psplash-) for that +# and add that into your image. +# You can also opt to change or override this line, but that isn't +# needed because psplash is using update-alternatives. +PREFERRED_VERSION_psplash ?= "psplash-angstrom" + PREFERRED_PROVIDER_avahi = "avahi" #Small machines prefer kdrive, but we might ship full Xorg in other images @@ -144,7 +153,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_dbus-glib = "dbus-glib" -PREFERRED_PROVIDER_esound ?= "pulseaudio" +PREFERRED_PROVIDER_esound ?= "pulseaudio" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs" -- cgit v1.2.3 From fabea12c54c6f6702e221d40d915fbe79939b6a0 Mon Sep 17 00:00:00 2001 From: woglinde Date: Sat, 28 Mar 2009 16:21:15 +0100 Subject: checksum.ini: add xine-1.1.16 remove older versions --- conf/checksums.ini | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'conf') diff --git a/conf/checksums.ini b/conf/checksums.ini index 0fdb29d8b6..42b4c86aa9 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -25698,25 +25698,9 @@ sha256=5e3db5f2387457f67798d664ed67c67337d2f84c45f15d986ee2f46f9b45d0d1 md5=d12efb18c7e3025c5e6a6f63144c2145 sha256=b968a10f52b0c5e807ec4c2c106f3aea301cf0ac00d04299b6961370c82c66d8 -[http://downloads.sourceforge.net/xine/xine-lib-1.0.tar.gz] -md5=96e5195c366064e7778af44c3e71f43a -sha256=6a283d383358200a9d6866d5d666a0227c8412d9c33d41f166f39c011482aed4 - -[http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1.0.tar.gz] -md5=96e5195c366064e7778af44c3e71f43a -sha256=6a283d383358200a9d6866d5d666a0227c8412d9c33d41f166f39c011482aed4 - -[http://heanet.dl.sourceforge.net/xine/xine-lib-1.0.tar.gz] -md5=96e5195c366064e7778af44c3e71f43a -sha256=6a283d383358200a9d6866d5d666a0227c8412d9c33d41f166f39c011482aed4 - -[http://downloads.sourceforge.net/xine/xine-lib-1.1.0.tar.gz] -md5=3537cfd58d253b4be20a4975e7086e38 -sha256=795085a067b3a11c1b3de48b4d07b01d8ffb6123bd188a73cb53b0605f875c64 - -[http://heanet.dl.sourceforge.net/xine/xine-lib-1.1.0.tar.gz] -md5=3537cfd58d253b4be20a4975e7086e38 -sha256=795085a067b3a11c1b3de48b4d07b01d8ffb6123bd188a73cb53b0605f875c64 +[http://downloads.sourceforge.net/xine/xine-lib-1.1.16.tar.bz2] +md5=acd1a210c5a6444e8fd44696469352bb +sha256=27df9c8f962797b235d69154705cfdf18d3e325f028f54e3e804f6dadb8237be [http://folks.o-hand.com/dodji/0xdeadbabe/xine.tgz] md5=8b78ce490cde6eb3c586656e9bc5ead8 -- cgit v1.2.3 From 02f4e5ae5dd49c2ab0c23866e0882041c43959a7 Mon Sep 17 00:00:00 2001 From: woglinde Date: Wed, 1 Apr 2009 22:55:35 +0200 Subject: xine: update to new xine recipe * as a side node only opie-mediaplayer2 compiles out of the box --- conf/distro/angstrom-2008.1.conf | 1 - conf/distro/include/angstrom-2007-for-openmoko.inc | 1 - conf/distro/include/preferred-om-2008-versions.inc | 3 --- conf/distro/kaeilos.conf | 1 - conf/distro/oplinux.conf | 1 - 5 files changed, 7 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 6c2c1bd5ab..0fb8332978 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -147,7 +147,6 @@ PREFERRED_PROVIDER_virtual/db ?= "db" PREFERRED_PROVIDER_virtual/db-native ?= "db-native" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" -PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index daf4dd01bb..b931d340c3 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -156,7 +156,6 @@ PREFERRED_PROVIDER_virtual/db ?= "db" PREFERRED_PROVIDER_virtual/db-native ?= "db-native" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" -PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 55d5136090..5cb20101a5 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1084,10 +1084,7 @@ PREFERRED_VERSION_libxfontcache ?= "1.0.4" PREFERRED_VERSION_libxfont-native ?= "1.3.0" PREFERRED_VERSION_libxft ?= "2.1.12" PREFERRED_VERSION_libxi ?= "1.1.3" -PREFERRED_VERSION_libxine ?= "1.1.0" -PREFERRED_VERSION_libxine-fb ?= "1.0" PREFERRED_VERSION_libxinerama ?= "1.0.2" -PREFERRED_VERSION_libxine-x11 ?= "1.0" PREFERRED_VERSION_libxkbfile ?= "1.0.4" PREFERRED_VERSION_libxkbui ?= "1.0.2" PREFERRED_VERSION_libxml2 ?= "2.7.2" diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf index a65bbff2c8..1cc165b008 100644 --- a/conf/distro/kaeilos.conf +++ b/conf/distro/kaeilos.conf @@ -123,7 +123,6 @@ PREFERRED_PROVIDER_virtual/db ?= "db" PREFERRED_PROVIDER_virtual/db-native ?= "db-native" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" -PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: diff --git a/conf/distro/oplinux.conf b/conf/distro/oplinux.conf index d4986bdc84..bab726ff16 100644 --- a/conf/distro/oplinux.conf +++ b/conf/distro/oplinux.conf @@ -42,7 +42,6 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" -PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_esound ?= "pulseaudio" -- cgit v1.2.3