summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/cairo/cairo_1.6.4.bb2
-rw-r--r--packages/gstreamer/gst-ffmpeg_0.10.4.bb5
-rw-r--r--packages/xorg-lib/pixman_0.11.8.bb2
-rw-r--r--packages/xorg-xserver/xserver-kdrive_1.4.2.bb1
-rw-r--r--packages/xorg-xserver/xserver-xorg_1.4.2.bb2
5 files changed, 3 insertions, 9 deletions
diff --git a/packages/cairo/cairo_1.6.4.bb b/packages/cairo/cairo_1.6.4.bb
index bbed315452..53a71f71df 100644
--- a/packages/cairo/cairo_1.6.4.bb
+++ b/packages/cairo/cairo_1.6.4.bb
@@ -5,5 +5,5 @@ DEFAULT_PREFERENCE = "-1"
SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
file://configure_fix.patch;patch=1 "
-PR = "r1"
+PR = "r2"
diff --git a/packages/gstreamer/gst-ffmpeg_0.10.4.bb b/packages/gstreamer/gst-ffmpeg_0.10.4.bb
index f4f872ce01..3efccbc3af 100644
--- a/packages/gstreamer/gst-ffmpeg_0.10.4.bb
+++ b/packages/gstreamer/gst-ffmpeg_0.10.4.bb
@@ -6,11 +6,6 @@ HOMEPAGE = "http://www.gstreamer.net/"
DEPENDS = "ffmpeg gstreamer zlib"
PR = "r4"
-# This uses the systems ffmpeg, which is unsupported, but we can't build the internal one with the current autotools (ab)usage
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_armv6 = "1"
-DEFAULT_PREFERENCE_armv7a = "1"
-
inherit autotools pkgconfig
SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
diff --git a/packages/xorg-lib/pixman_0.11.8.bb b/packages/xorg-lib/pixman_0.11.8.bb
index 8e4bd8cff3..a6cc53dabb 100644
--- a/packages/xorg-lib/pixman_0.11.8.bb
+++ b/packages/xorg-lib/pixman_0.11.8.bb
@@ -3,8 +3,6 @@ PRIORITY = "optional"
DESCRIPTION = "Low-level pixel manipulation library."
LICENSE = "X11"
-DEFAULT_PREFERENCE = "-1"
-
SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \
file://pixman-arm.patch;patch=1 \
"
diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.2.bb b/packages/xorg-xserver/xserver-kdrive_1.4.2.bb
index 5155a267b5..1583cc3c6c 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.4.2.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.2.bb
@@ -3,6 +3,7 @@ require xserver-kdrive-common.inc
DEPENDS += "hal libxkbfile libxcalibrate pixman"
PE = "1"
+PR = "r1"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
index 6e643a9138..0b0f847dff 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
DESCRIPTION = "the X.Org X server"
DEPENDS += "pixman"
PE = "1"
-PR = "r1"
+PR = "r2"
SRC_URI += "file://drmfix.patch;patch=1 \
file://pkgconfig_fix.patch;patch=1 \