diff options
-rw-r--r-- | conf/distro/amsdelta-oe.conf | 2 | ||||
-rw-r--r-- | conf/distro/ezx.conf | 2 | ||||
-rw-r--r-- | conf/distro/familiar-unstable.conf | 2 | ||||
-rw-r--r-- | conf/distro/generic-unstable.conf | 6 | ||||
-rw-r--r-- | conf/distro/generic.conf | 9 | ||||
-rw-r--r-- | conf/distro/include/preferred-xorg-versions-X11R7.0.inc | 2 | ||||
-rw-r--r-- | conf/distro/include/preferred-xorg-versions-X11R7.1.inc | 2 | ||||
-rw-r--r-- | conf/distro/include/slugos.inc | 2 | ||||
-rw-r--r-- | conf/distro/jlime-donkey.conf | 2 | ||||
-rw-r--r-- | conf/distro/maemo-1.0.conf | 2 | ||||
-rw-r--r-- | conf/distro/openzaurus-unstable.conf | 2 |
11 files changed, 22 insertions, 11 deletions
diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf index 4827e458d1..66dc4fb0a6 100644 --- a/conf/distro/amsdelta-oe.conf +++ b/conf/distro/amsdelta-oe.conf @@ -53,7 +53,7 @@ require conf/distro/include/preferred-opie-versions.inc PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" require conf/distro/include/preferred-gpe-versions-2.8.inc diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf index 1e156dd363..5b12b6f93b 100644 --- a/conf/distro/ezx.conf +++ b/conf/distro/ezx.conf @@ -72,7 +72,7 @@ require conf/distro/include/preferred-opie-versions.inc # GPE # PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" require conf/distro/include/preferred-gpe-versions-2.8.inc # diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index a04b526f5f..6ae4e9ddc3 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -71,7 +71,7 @@ require conf/distro/include/preferred-opie-versions.inc PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" require conf/distro/include/preferred-gpe-versions-2.8.inc # diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf index 52659b75e2..80fd25ae19 100644 --- a/conf/distro/generic-unstable.conf +++ b/conf/distro/generic-unstable.conf @@ -49,6 +49,12 @@ PREFERRED_VERSION_glibc-intermediate = "2.4" PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" # +# Framebuffer & X +# +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" +PREFERRED_PROVIDER_tslib ?= tslib + +# # GPE # require conf/distro/include/preferred-gpe-versions.inc diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index fb38785add..9ecdf7de7e 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -35,8 +35,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDER_tslib ?= tslib - PREFERRED_VERSION_gcc = "3.4.4" PREFERRED_VERSION_gcc-cross = "3.4.4" PREFERRED_VERSION_gcc-cross-initial = "3.4.4" @@ -60,6 +58,13 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" require conf/distro/include/sane-srcdates.inc # +# Framebuffer & X +# +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" +PREFERRED_PROVIDER_tslib ?= tslib + + +# # GPE # require conf/distro/include/preferred-gpe-versions.inc diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc index 8c6b122585..6db9d92f71 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc @@ -4,7 +4,7 @@ PREFERRED_PROVIDER_libxext = "libxext" PREFERRED_PROVIDER_xext = "libxext" PREFERRED_PROVIDER_libxi = "libxi" PREFERRED_PROVIDER_libxft = "libxft" -PREFERRED_PROVIDER_libx11 = "libx11" +PREFERRED_PROVIDER_virtual/libx11 = "libx11" PREFERRED_PROVIDER_libxpm = "libxpm" PREFERRED_PROVIDER_xpm = "libxpm" PREFERRED_PROVIDER_libxt = "libxt" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 4371fae61d..43353dcdcd 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -4,7 +4,7 @@ PREFERRED_PROVIDER_libxext = "libxext" PREFERRED_PROVIDER_xext = "libxext" PREFERRED_PROVIDER_libxi = "libxi" PREFERRED_PROVIDER_libxft = "libxft" -PREFERRED_PROVIDER_libx11 = "libx11" +PREFERRED_PROVIDER_virtual/libx11 = "libx11" PREFERRED_PROVIDER_libxpm = "libxpm" PREFERRED_PROVIDER_xpm = "libxpm" PREFERRED_PROVIDER_libxt = "libxt" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index c2b169106f..5e7947f866 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -179,7 +179,7 @@ PREFERRED_VERSION_ixp-osal ?= "2.1" PREFERRED_VERSION_ixp400-eth ?= "1.5" # Select the smallest provider of x11 libraries -PREFERRED_PROVIDER_libx11 ?= "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" SRCDATE_diet-x11 ?= "20060106" # Latest wpa-supplicant which supports madwifi-ng diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 26c1311831..dbc7b3ad41 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -56,7 +56,7 @@ PREFERRED_VERSION_glib-1.2 = "1.2.10" #<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11. #<> PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312" -PREFERRED_PROVIDER_libx11 = "x11" +PREFERRED_PROVIDER_virtual/libx11 = "x11" PREFERRED_PROVIDER_tslib = "tslib" PREFRRED_VERSION_cairo = "1.0.4" #<> diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf index 900f24dd03..f10e89ce89 100644 --- a/conf/distro/maemo-1.0.conf +++ b/conf/distro/maemo-1.0.conf @@ -29,7 +29,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" require conf/distro/include/preferred-gpe-versions.inc diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index e8eef43b70..43492944ff 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -67,7 +67,7 @@ require conf/distro/include/preferred-opie-versions.inc # GPE # PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" require conf/distro/include/preferred-gpe-versions-2.8.inc # |