From f5ff8989d3bc71f2245d2b8a60e8b60a6c07933f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 01:00:28 +0100 Subject: [PATCH 01/24] Mesa: - update to Mesa-7.8-20100309 --- packages/graphics/Mesa/build | 8 +++- packages/graphics/Mesa/install | 7 ++-- .../patches/101_ubuntu_hidden_glname.patch | 12 ------ .../Mesa/patches/102_dont-vblank.diff | 14 ------- .../Mesa/patches/108_big_endian.patch | 18 --------- ...fix_relocation_delta_for_wm_surfaces.patch | 26 ------------ .../Mesa/patches/110_fix-libkms-api.diff | 40 ------------------- packages/graphics/Mesa/url | 3 +- 8 files changed, 11 insertions(+), 117 deletions(-) delete mode 100644 packages/graphics/Mesa/patches/101_ubuntu_hidden_glname.patch delete mode 100644 packages/graphics/Mesa/patches/102_dont-vblank.diff delete mode 100644 packages/graphics/Mesa/patches/108_big_endian.patch delete mode 100644 packages/graphics/Mesa/patches/109_fix_relocation_delta_for_wm_surfaces.patch delete mode 100644 packages/graphics/Mesa/patches/110_fix-libkms-api.diff diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build index c4543087c8..73a404271c 100755 --- a/packages/graphics/Mesa/build +++ b/packages/graphics/Mesa/build @@ -17,7 +17,6 @@ get_graphicdrivers cd $PKG_BUILD HOST_CC=$HOST_CC \ -OPT_FLAGS="$CFLAGS -D_GNU_SOURCE" \ HOST_OPT_FLAGS="$HOST_CFLAGS" \ X11_INCLUDES= \ DRI_DRIVER_INSTALL_DIR="$XORG_PATH_DRI" \ @@ -48,7 +47,12 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \ --without-demos \ --disable-gallium \ -make +make -C src/glsl CC=$HOST_CC CFLAGS="" +mv src/glsl/apps/compile ./host_compile + +make clean + +make GLSL_CL="\$(TOP)/host_compile" make -C progs/xdemos diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install index 3b02a82bd2..24fadf2493 100755 --- a/packages/graphics/Mesa/install +++ b/packages/graphics/Mesa/install @@ -18,8 +18,9 @@ mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib/dri - cp -PR $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri + cp -PR $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true -# todo: only in devel build mkdir -p $INSTALL/usr/bin - cp -PR $PKG_BUILD/progs/xdemos/{glxdemo,glxgears,glxinfo} $INSTALL/usr/bin + cp -PR $PKG_BUILD/progs/xdemos/glxdemo $INSTALL/usr/bin + cp -PR $PKG_BUILD/progs/xdemos/glxgears $INSTALL/usr/bin + cp -PR $PKG_BUILD/progs/xdemos/glxinfo $INSTALL/usr/bin diff --git a/packages/graphics/Mesa/patches/101_ubuntu_hidden_glname.patch b/packages/graphics/Mesa/patches/101_ubuntu_hidden_glname.patch deleted file mode 100644 index a04106c4b0..0000000000 --- a/packages/graphics/Mesa/patches/101_ubuntu_hidden_glname.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: mesa/src/mesa/x86/glapi_x86.S -=================================================================== ---- mesa.orig/src/mesa/x86/glapi_x86.S 2009-06-29 14:43:07.000000000 +0300 -+++ mesa/src/mesa/x86/glapi_x86.S 2009-06-29 14:45:38.000000000 +0300 -@@ -148,7 +148,6 @@ - - ALIGNTEXT16 - GLOBL GLNAME(gl_dispatch_functions_start) -- HIDDEN(GLNAME(gl_dispatch_functions_start)) - GLNAME(gl_dispatch_functions_start): - - GL_STUB(NewList, _gloffset_NewList, NewList@8) diff --git a/packages/graphics/Mesa/patches/102_dont-vblank.diff b/packages/graphics/Mesa/patches/102_dont-vblank.diff deleted file mode 100644 index 3f1c3ae615..0000000000 --- a/packages/graphics/Mesa/patches/102_dont-vblank.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c -index 5233e58..5dded4b 100644 ---- a/src/mesa/drivers/dri/intel/intel_screen.c -+++ b/src/mesa/drivers/dri/intel/intel_screen.c -@@ -55,7 +55,7 @@ PUBLIC const char __driConfigOptions[] = - DRI_CONF_BEGIN - DRI_CONF_SECTION_PERFORMANCE - DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS) -- DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_ALWAYS_SYNC) -+ DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0) - /* Options correspond to DRI_CONF_BO_REUSE_DISABLED, - * DRI_CONF_BO_REUSE_ALL - */ - diff --git a/packages/graphics/Mesa/patches/108_big_endian.patch b/packages/graphics/Mesa/patches/108_big_endian.patch deleted file mode 100644 index 7341119082..0000000000 --- a/packages/graphics/Mesa/patches/108_big_endian.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nurp mesa-7.6.0~git20090817.7c422387/src/mesa/drivers/dri/r300/r300_draw.c mesa-7.6.0~git20090817.7c422387-working/src/mesa/drivers/dri/r300/r300_draw.c ---- mesa-7.6.0~git20090817.7c422387/src/mesa/drivers/dri/r300/r300_draw.c 2009-08-17 07:30:14.000000000 -0700 -+++ mesa-7.6.0~git20090817.7c422387-working/src/mesa/drivers/dri/r300/r300_draw.c 2009-08-26 13:38:46.000000000 -0700 -@@ -108,12 +108,13 @@ static void r300FixupIndexBuffer(GLconte - - #if MESA_BIG_ENDIAN - } else { /* if (mesa_ind_buf->type == GL_UNSIGNED_SHORT) */ -+ GLuint size; - GLushort *in = (GLushort *)src_ptr; - size = sizeof(GLushort) * ((mesa_ind_buf->count + 1) & ~1); - - radeonAllocDmaRegion(&r300->radeon, &r300->ind_buf.bo, &r300->ind_buf.bo_offet, size, 4); - -- assert(r300->ind_buf.bo->ptr != NULL) -+ assert(r300->ind_buf.bo->ptr != NULL); - out = (GLuint *)ADD_POINTERS(r300->ind_buf.bo->ptr, r300->ind_buf.bo_offset); - - for (i = 0; i + 1 < mesa_ind_buf->count; i += 2) { diff --git a/packages/graphics/Mesa/patches/109_fix_relocation_delta_for_wm_surfaces.patch b/packages/graphics/Mesa/patches/109_fix_relocation_delta_for_wm_surfaces.patch deleted file mode 100644 index 34279dda97..0000000000 --- a/packages/graphics/Mesa/patches/109_fix_relocation_delta_for_wm_surfaces.patch +++ /dev/null @@ -1,26 +0,0 @@ -From acfea5c705f383692e661d37c5cd7da2f3db559b Mon Sep 17 00:00:00 2001 -From: Eric Anholt -Date: Wed, 09 Sep 2009 19:35:30 +0000 -Subject: i965: Fix relocation delta for WM surfaces. - -This was a regression in 0f328c90dbc893e15005f2ab441d309c1c176245. - -Bug #23688 -Bug #23254 -(cherry picked from commit 5604b27b9326ac542069a49ed9650c4b0d3e939a) ---- -diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c -index 096f743..3dcc592 100644 ---- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c -+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c -@@ -629,7 +629,7 @@ brw_update_renderbuffer_surface(struct brw_context *brw, - drm_intel_bo_emit_reloc(brw->wm.surf_bo[unit], - offsetof(struct brw_surface_state, ss1), - region_bo, -- surf.ss1.base_addr, -+ surf.ss1.base_addr - region_bo->offset, - I915_GEM_DOMAIN_RENDER, - I915_GEM_DOMAIN_RENDER); - } --- -cgit v0.8.2 diff --git a/packages/graphics/Mesa/patches/110_fix-libkms-api.diff b/packages/graphics/Mesa/patches/110_fix-libkms-api.diff deleted file mode 100644 index cea46b01fe..0000000000 --- a/packages/graphics/Mesa/patches/110_fix-libkms-api.diff +++ /dev/null @@ -1,40 +0,0 @@ -From 8db8adfd01a1ff1e2a160ae3b0199bd3daa4191a Mon Sep 17 00:00:00 2001 -From: Jakob Bornecrantz -Date: Thu, 28 Jan 2010 16:59:26 +0000 -Subject: st/xorg: Update to new libkms interface but be backwards compatible - ---- -diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c -index 0160b1a..daa9f8b 100644 ---- a/src/gallium/state_trackers/xorg/xorg_crtc.c -+++ b/src/gallium/state_trackers/xorg/xorg_crtc.c -@@ -243,7 +243,11 @@ crtc_load_cursor_argb_kms(xf86CrtcPtr crtc, CARD32 * image) - unsigned attr[8]; - - attr[0] = KMS_BO_TYPE; -+#ifdef KMS_BO_TYPE_CURSOR_64X64_A8R8G8B8 -+ attr[1] = KMS_BO_TYPE_CURSOR_64X64_A8R8G8B8; -+#else - attr[1] = KMS_BO_TYPE_CURSOR; -+#endif - attr[2] = KMS_WIDTH; - attr[3] = 64; - attr[4] = KMS_HEIGHT; -diff --git a/src/gallium/state_trackers/xorg/xorg_driver.c b/src/gallium/state_trackers/xorg/xorg_driver.c -index e4ad789..f53a879 100644 ---- a/src/gallium/state_trackers/xorg/xorg_driver.c -+++ b/src/gallium/state_trackers/xorg/xorg_driver.c -@@ -1008,7 +1008,11 @@ drv_create_front_buffer_kms(ScrnInfoPtr pScrn) - int ret; - - attr[0] = KMS_BO_TYPE; -+#ifdef KMS_BO_TYPE_SCANOUT_X8R8G8B8 -+ attr[1] = KMS_BO_TYPE_SCANOUT_X8R8G8B8; -+#else - attr[1] = KMS_BO_TYPE_SCANOUT; -+#endif - attr[2] = KMS_WIDTH; - attr[3] = pScrn->virtualX; - attr[4] = KMS_HEIGHT; --- -cgit v0.8.3-6-g21f6 diff --git a/packages/graphics/Mesa/url b/packages/graphics/Mesa/url index 162dcaf14a..2e883a99b3 100644 --- a/packages/graphics/Mesa/url +++ b/packages/graphics/Mesa/url @@ -1,2 +1 @@ -ftp://ftp.freedesktop.org/pub/mesa/7.7/MesaLib-7.7.tar.bz2 -ftp://ftp.freedesktop.org/pub/mesa/7.7/MesaDemos-7.7.tar.bz2 \ No newline at end of file +http://sources.openelec.tv/svn/Mesa-7.8-20100309.tar.bz2 From 3691c13b30383f069b87d99a91a481b0433bf5dd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 01:00:52 +0100 Subject: [PATCH 02/24] libdrm: - update to libdrm-20100309 --- packages/graphics/libdrm/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/libdrm/url b/packages/graphics/libdrm/url index 20e8616e6a..8121b29364 100644 --- a/packages/graphics/libdrm/url +++ b/packages/graphics/libdrm/url @@ -1 +1 @@ -http://dri.freedesktop.org/libdrm/libdrm-2.4.19.tar.bz2 \ No newline at end of file +http://sources.openelec.tv/svn/libdrm-20100309.tar.bz2 From 0219a0d2c63379273d8ba9cd96c5dc75d8c7133e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 01:02:38 +0100 Subject: [PATCH 03/24] xorg-server: - update to xorg-server-20100309 --- packages/x11/xserver/xorg-server/build | 16 +- .../xserver/xorg-server/config/10-quirks.conf | 10 + .../x11/xserver/xorg-server/init.d/60_xorg | 3 +- packages/x11/xserver/xorg-server/install | 14 +- ...xkbcomp-output-for-fast-start-up-v5.3.diff | 336 ------------------ .../patches/100_xserver_exa_force_greedy.diff | 30 -- .../patches/110_fedora_no_move_damage.diff | 35 -- ...56_exevents_copykeyclass_nullptrcheck.diff | 22 -- .../patches/157_check_null_modes.diff | 14 - .../patches/158_raise_maxclients.diff | 12 - .../patches/162_null_crtc_in_rotation.diff | 13 - .../patches/164_trap-aspect-ratios.diff | 61 ---- .../166_nullptr_xinerama_keyrepeat.diff | 30 -- .../patches/167_nullptr_xisbread.diff | 13 - .../patches/169_mipointer_nullptr_checks.diff | 107 ------ ...172_cwgetbackingpicture_nullptr_check.diff | 39 -- .../patches/173_edid_quirk_philips_lcd.diff | 21 -- ...0_fedora_no_synaptics_mouse_synthesis.diff | 16 - .../patches/201_fedora-pci-primary.diff | 91 ----- .../patches/30_typedef-apm-2.6.24.diff | 12 - ...proc-instead-of-sysfs-for-pci-domains.diff | 32 -- .../66_only-switch-vt-when-active.diff | 32 -- ...oppy-heuristic-first-for-initial-mode.diff | 17 + .../patches/xorg-x11-nonroot-vesa.diff | 12 + ....patch => xserver-1.5.0-bg-none-root.diff} | 30 +- .../xserver-1.5.0-projector-fb-size.patch | 32 -- .../patches/xserver-1.5.1-mode-debug.patch | 26 -- .../xserver-1.6.0-less-acpi-brokenness.patch | 31 -- .../xserver-1.7.0-glx-versioning.patch | 233 ------------ .../patches/xserver-1.7.1-glx14-swrast.patch | 26 -- .../patches/xserver-1.7.1-libcrypto.patch | 35 -- .../patches/xserver-1.8-udev-warning.diff | 37 ++ .../patches/xserver-boottime.patch | 38 -- .../patches/xserver-no-root-2.diff | 53 +++ packages/x11/xserver/xorg-server/url | 2 +- 35 files changed, 158 insertions(+), 1373 deletions(-) create mode 100644 packages/x11/xserver/xorg-server/config/10-quirks.conf delete mode 100644 packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/100_xserver_exa_force_greedy.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/110_fedora_no_move_damage.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/156_exevents_copykeyclass_nullptrcheck.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/157_check_null_modes.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/158_raise_maxclients.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/162_null_crtc_in_rotation.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/164_trap-aspect-ratios.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/166_nullptr_xinerama_keyrepeat.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/167_nullptr_xisbread.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/169_mipointer_nullptr_checks.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/172_cwgetbackingpicture_nullptr_check.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/173_edid_quirk_philips_lcd.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/180_fedora_no_synaptics_mouse_synthesis.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/201_fedora-pci-primary.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/30_typedef-apm-2.6.24.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/60_use-proc-instead-of-sysfs-for-pci-domains.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/66_only-switch-vt-when-active.diff create mode 100644 packages/x11/xserver/xorg-server/patches/use-sloppy-heuristic-first-for-initial-mode.diff create mode 100644 packages/x11/xserver/xorg-server/patches/xorg-x11-nonroot-vesa.diff rename packages/x11/xserver/xorg-server/patches/{xserver-1.5.0-bg-none-root.patch => xserver-1.5.0-bg-none-root.diff} (88%) delete mode 100644 packages/x11/xserver/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch delete mode 100644 packages/x11/xserver/xorg-server/patches/xserver-1.5.1-mode-debug.patch delete mode 100644 packages/x11/xserver/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch delete mode 100644 packages/x11/xserver/xorg-server/patches/xserver-1.7.0-glx-versioning.patch delete mode 100644 packages/x11/xserver/xorg-server/patches/xserver-1.7.1-glx14-swrast.patch delete mode 100644 packages/x11/xserver/xorg-server/patches/xserver-1.7.1-libcrypto.patch create mode 100644 packages/x11/xserver/xorg-server/patches/xserver-1.8-udev-warning.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/xserver-boottime.patch create mode 100644 packages/x11/xserver/xorg-server/patches/xserver-no-root-2.diff diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build index 6a9635034d..bb06faf44d 100755 --- a/packages/x11/xserver/xorg-server/build +++ b/packages/x11/xserver/xorg-server/build @@ -29,8 +29,7 @@ $SCRIPTS/build libfontenc $SCRIPTS/build pixman $SCRIPTS/build fontsproto $SCRIPTS/build xf86bigfontproto -$SCRIPTS/build dbus -$SCRIPTS/build hal +$SCRIPTS/build udev if [ "$XINERAMA_SUPPORT" = "yes" ]; then $SCRIPTS/build libXinerama @@ -40,7 +39,6 @@ else fi cd $PKG_BUILD -autoconf ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ @@ -61,7 +59,6 @@ autoconf --enable-registry \ --disable-composite \ $XORG_XINERAMA \ - --enable-null-root-cursor \ --enable-mitshm \ --disable-xres \ --disable-record \ @@ -83,8 +80,9 @@ autoconf --enable-dbe \ --disable-xf86bigfont \ --enable-dpms \ - --enable-config-dbus \ - --enable-config-hal \ + --enable-config-udev \ + --disable-config-dbus \ + --disable-config-hal \ --enable-xfree86-utils \ --enable-xorg \ --disable-dmx \ @@ -95,7 +93,6 @@ autoconf --disable-xwin \ --disable-kdrive \ --disable-xephyr \ - --disable-xsdl \ --disable-xfake \ --enable-xfbdev \ --disable-install-setuid \ @@ -103,14 +100,15 @@ autoconf --with-int10=x86emu \ --disable-ipv6 \ --with-gnu-ld \ + --with-sha1=libcrypto \ --with-os-vendor="OpenELEC" \ --with-module-dir=$XORG_PATH_MODULES \ --with-xkb-path=$XORG_PATH_XKB \ --with-xkb-output=/var/cache/xkb \ --with-log-dir=/var/log \ --with-dri-driver-path=$XORG_PATH_DRI \ - --with-fontdir=$XORG_PATH_FONTS \ - --with-default-font-path="$XORG_PATH_FONTS/liberation,$XORG_PATH_FONTS/misc,built-ins" \ + --with-fontrootdir=$XORG_PATH_FONTS \ + --with-default-font-path="$XORG_PATH_FONTS/misc,built-ins" make diff --git a/packages/x11/xserver/xorg-server/config/10-quirks.conf b/packages/x11/xserver/xorg-server/config/10-quirks.conf new file mode 100644 index 0000000000..7afad22dc6 --- /dev/null +++ b/packages/x11/xserver/xorg-server/config/10-quirks.conf @@ -0,0 +1,10 @@ +# Collection of quirks and blacklist/whitelists for specific devices. + + +# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable +# http://bugs.freedesktop.org/show_bug.cgi?id=22442 +Section "InputClass" + Identifier "ThinkPad HDAPS accelerometer blacklist" + MatchProduct "ThinkPad HDAPS accelerometer data" + Option "Ignore" "on" +EndSection diff --git a/packages/x11/xserver/xorg-server/init.d/60_xorg b/packages/x11/xserver/xorg-server/init.d/60_xorg index de8f1fcd26..5dd0d31718 100644 --- a/packages/x11/xserver/xorg-server/init.d/60_xorg +++ b/packages/x11/xserver/xorg-server/init.d/60_xorg @@ -3,7 +3,7 @@ # runlevels: openelec XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf" -XORG_ARGS="-s 0 -noreset -allowMouseOpenFail -nocursor -nolisten tcp" +XORG_ARGS="-s 0 -nr -noreset -allowMouseOpenFail -nocursor -nolisten tcp" #------------------------------------------------------------------------------- # do not change anything below @@ -13,6 +13,7 @@ XORG_ARGS="-s 0 -noreset -allowMouseOpenFail -nocursor -nolisten tcp" if lspci -n | grep 0300 | grep -q 10de; then + XORG_ARGS="$XORG_ARGS -ignoreABI" [ -f $XORG_NVIDIA_CONF ] && XORG_ARGS="$XORG_ARGS -config $XORG_NVIDIA_CONF" progress "Found nVidia card, enabling NVIDIA GLX as requested" diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index a510cb56b4..0937985fcf 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -13,8 +13,7 @@ $SCRIPTS/install libXv $SCRIPTS/install libdrm $SCRIPTS/install Mesa $SCRIPTS/install pixman -$SCRIPTS/install dbus -$SCRIPTS/install hal +$SCRIPTS/install udev [ "$XINERAMA_SUPPORT" = "yes" ] && $SCRIPTS/install libXinerama @@ -54,11 +53,8 @@ mkdir -p $XORG_DST/multimedia mkdir -p $INSTALL/usr/lib/xorg cp $PKG_BUILD/dix/protocol.txt $INSTALL/usr/lib/xorg -mkdir -p $INSTALL/etc/dbus-1/system.d - cp $PKG_BUILD/config/xorg-server.conf $INSTALL/etc/dbus-1/system.d - -mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/ - cp $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi +mkdir -p $INSTALL/etc/X11/xorg.conf.d + cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d #Fonts $SCRIPTS/install encodings @@ -76,11 +72,9 @@ mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/ $SCRIPTS/install xf86-input-synaptics $SCRIPTS/install xf86-input-wacom -get_graphicdrivers - for drv in $XORG_DRIVERS; do $SCRIPTS/install xf86-video-$drv done -#Tools +# Tools $SCRIPTS/install pciutils diff --git a/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff b/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff deleted file mode 100644 index 0312982178..0000000000 --- a/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff +++ /dev/null @@ -1,336 +0,0 @@ -diff -Naur xorg-server-1.7.99.1/configure xorg-server-1.7.99.1.patch/configure -diff -Naur xorg-server-1.7.99.1/configure.ac xorg-server-1.7.99.1.patch/configure.ac ---- xorg-server-1.7.99.1/configure.ac 2009-10-21 18:06:54.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/configure.ac 2009-10-24 10:51:17.074488205 +0200 -@@ -501,9 +501,9 @@ - AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]), - [ XKBPATH="$withval" ], - [ XKBPATH="${datadir}/X11/xkb" ]) --AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]), -+AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${localstatedir}/cache/xkb)]), - [ XKBOUTPUT="$withval" ], -- [ XKBOUTPUT="compiled" ]) -+ [ XKBOUTPUT="${localstatedir}/cache/xkb" ]) - AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES], - [Keyboard ruleset (default: base/evdev)]), - [ XKB_DFLT_RULES="$withval" ], -@@ -1099,7 +1099,7 @@ - dnl Make sure XKM_OUTPUT_DIR is an absolute path - XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` - if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then -- XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" -+ AC_MSG_ERROR([xkb-output must be an absolute path.]) - fi - - dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed -diff -Naur xorg-server-1.7.99.1/xkb/ddxLoad.c xorg-server-1.7.99.1.patch/xkb/ddxLoad.c ---- xorg-server-1.7.99.1/xkb/ddxLoad.c 2009-10-21 15:46:53.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/xkb/ddxLoad.c 2009-10-24 10:50:23.303364966 +0200 -@@ -30,6 +30,13 @@ - - #include - -+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */ -+# include -+#else /* Use OpenSSL's libcrypto */ -+# include /* buggy openssl/sha.h wants size_t */ -+# include -+#endif -+ - #include - #include - #include -@@ -43,24 +50,13 @@ - #define XKBSRV_NEED_FILE_FUNCS - #include - #include -+#include - #include "xkb.h" - - #if defined(CSRG_BASED) || defined(linux) || defined(__GNU__) - #include - #endif - -- /* -- * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is -- * relative to the top-level XKB configuration directory. -- * Making the server write to a subdirectory of that directory -- * requires some work in the general case (install procedure -- * has to create links to /var or somesuch on many machines), -- * so we just compile into /usr/tmp for now. -- */ --#ifndef XKM_OUTPUT_DIR --#define XKM_OUTPUT_DIR "compiled/" --#endif -- - #define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\"" - #define ERROR_PREFIX "\"> \"" - #define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\"" -@@ -175,6 +171,45 @@ - } - - static Bool -+Sha1Asc(char sha1Asc[SHA_DIGEST_LENGTH*2+1], const char * input) -+{ -+ int i; -+ unsigned char sha1[SHA_DIGEST_LENGTH]; -+ -+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */ -+ SHA1_CTX ctx; -+ -+ SHA1Init (&ctx); -+ SHA1Update (&ctx, input, strlen(input)); -+ SHA1Final (sha1, &ctx); -+#else /* Use OpenSSL's libcrypto */ -+ SHA_CTX ctx; -+ int success; -+ -+ success = SHA1_Init (&ctx); -+ if (! success) -+ return BadAlloc; -+ -+ success = SHA1_Update (&ctx, input, strlen(input)); -+ if (! success) -+ return BadAlloc; -+ -+ success = SHA1_Final (sha1, &ctx); -+ if (! success) -+ return BadAlloc; -+#endif -+ -+ /* convert sha1 to sha1_asc */ -+ for(i=0; i nameRtrnLen) && nameRtrn) { -+ ErrorF("[xkb] nameRtrn too small to hold xkmfile name\n"); -+ return False; -+ } -+ strncpy(nameRtrn, xkmfile, nameRtrnLen); -+ -+ /* if the xkm file already exists, reuse it */ -+ canonicalXkmFileName = Xprintf("%s%s.xkm", xkm_output_dir, xkmfile); -+ if (access(canonicalXkmFileName, R_OK) == 0) { -+ /* yes, we can reuse the old xkm file */ -+ LogMessage(X_INFO, "XKB: reuse xkmfile %s\n", canonicalXkmFileName); -+ result = True; -+ goto _ret; -+ } -+ LogMessage(X_INFO, "XKB: generating xkmfile %s\n", canonicalXkmFileName); -+ -+ /* continue to call xkbcomp to compile the keymap. to avoid race -+ condition, we compile it to a tmpfile then rename it to -+ xkmfile */ -+ - #ifdef WIN32 - strcpy(tmpname, Win32TempDir()); - strcat(tmpname, "\\xkb_XXXXXX"); -@@ -225,19 +318,30 @@ - } - } - -+ if ( (tmpXkmFile = tempnam(xkm_output_dir, NULL)) == NULL ) { -+ ErrorF("[xkb] Can't generate temp xkm file name"); -+ result = False; -+ goto _ret; -+ } -+ - buf = Xprintf("\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" " -- "-em1 %s -emp %s -eml %s \"%s%s.xkm\"", -+ "-em1 %s -emp %s -eml %s \"%s\"", - xkbbindir, xkbbindirsep, - ( (xkbDebugFlags < 2) ? 1 : - ((xkbDebugFlags > 10) ? 10 : (int)xkbDebugFlags) ), -- xkbbasedirflag, xkmfile, -+ xkbbasedirflag, xkbfile, - PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1, -- xkm_output_dir, keymap); -+ tmpXkmFile); - - if (xkbbasedirflag != emptystring) { - xfree(xkbbasedirflag); - } - -+ /* there's a potential race condition between calling tempnam() -+ and invoking xkbcomp to write the result file (potential temp -+ file name conflicts), but since xkbcomp is a standalone -+ program, we have to live with this */ -+ - #ifndef WIN32 - out= Popen(buf,"w"); - #else -@@ -245,31 +349,43 @@ - #endif - - if (out!=NULL) { --#ifdef DEBUG -- if (xkbDebugFlags) { -- ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n"); -- XkbWriteXKBKeymapForNames(stderr,names,xkb,want,need); -+ /* write XKBKeyMapBuf to xkbcomp */ -+ if (EOF==fputs(xkbKeyMapBuf, out)) -+ { -+ ErrorF("[xkb] Sending keymap to xkbcomp failed\n"); -+ result = False; -+ goto _ret; - } --#endif -- XkbWriteXKBKeymapForNames(out,names,xkb,want,need); - #ifndef WIN32 - if (Pclose(out)==0) - #else - if (fclose(out)==0 && System(buf) >= 0) - #endif - { -+ /* xkbcomp success */ - if (xkbDebugFlags) - DebugF("[xkb] xkb executes: %s\n",buf); -- if (nameRtrn) { -- strncpy(nameRtrn,keymap,nameRtrnLen); -- nameRtrn[nameRtrnLen-1]= '\0'; -+ -+ /* if canonicalXkmFileName already exists now, we simply -+ overwrite it, this is OK */ -+ ret = rename(tmpXkmFile, canonicalXkmFileName); -+ if (0 != ret) { -+ ErrorF("[xkb] Can't rename %s to %s, error: %s\n", -+ tmpXkmFile, canonicalXkmFileName, -+ strerror(errno)); -+ -+ /* in case of error, don't unlink tmpXkmFile, leave it -+ for debugging */ -+ -+ result = False; -+ goto _ret; - } -- if (buf != NULL) -- xfree (buf); -- return True; -+ -+ result = True; -+ goto _ret; - } - else -- LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap); -+ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile); - #ifdef WIN32 - /* remove the temporary file */ - unlink(tmpname); -@@ -284,9 +400,17 @@ - } - if (nameRtrn) - nameRtrn[0]= '\0'; -+ result = False; -+ -+_ret: -+ if (tmpXkmFile) -+ free(tmpXkmFile); -+ if (canonicalXkmFileName) -+ xfree(canonicalXkmFileName); - if (buf != NULL) - xfree (buf); -- return False; -+ -+ return result; - } - - static FILE * -@@ -370,7 +494,6 @@ - DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined); - } - fclose(file); -- (void) unlink (fileName); - return (need|want)&(~missing); - } - -diff -Naur xorg-server-1.7.99.1/xkb/README.compiled xorg-server-1.7.99.1.patch/xkb/README.compiled ---- xorg-server-1.7.99.1/xkb/README.compiled 2008-10-13 01:19:06.000000000 +0200 -+++ xorg-server-1.7.99.1.patch/xkb/README.compiled 2009-10-24 10:50:28.069400854 +0200 -@@ -4,10 +4,10 @@ - or some other tool might destroy or replace the files in this directory, - so it is not a safe place to store compiled keymaps for long periods of - time. The default keymap for any server is usually stored in: -- X-default.xkm --where is the display number of the server in question, which makes --it possible for several servers *on the same host* to share the same --directory. -+ server-.xkm -+ -+where is the SHA1 hash of keymap source, so that compiled -+keymap of different keymap sources are stored in different files. - - Unless the X server is modified, sharing this directory between servers on - different hosts could cause problems. diff --git a/packages/x11/xserver/xorg-server/patches/100_xserver_exa_force_greedy.diff b/packages/x11/xserver/xorg-server/patches/100_xserver_exa_force_greedy.diff deleted file mode 100644 index 24dd77017a..0000000000 --- a/packages/x11/xserver/xorg-server/patches/100_xserver_exa_force_greedy.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- xorg-server.orig/exa/exa.c 2008-10-14 23:24:44.000000000 +0200 -+++ xorg-server/exa/exa.c 2008-10-14 23:25:52.000000000 +0200 -@@ -882,6 +882,11 @@ - dixSetPrivate(&pScreen->devPrivates, exaScreenPrivateKey, pExaScr); - - pExaScr->migration = ExaMigrationAlways; -+ if (pScreenInfo->flags & EXA_MIGRATION_GREEDY) { -+ pExaScr->migration = ExaMigrationGreedy; -+ LogMessage(X_INFO, "EXA(%d): Forcing greedy migration option\n", -+ pScreen->myNum); -+ } - - exaDDXDriverInit(pScreen); - ---- xorg-server.orig/exa/exa.h 2008-10-14 23:24:44.000000000 +0200 -+++ xorg-server/exa/exa.h 2008-10-14 23:25:52.000000000 +0200 -@@ -737,6 +737,13 @@ - #define EXA_TWO_BITBLT_DIRECTIONS (1 << 2) - - /** -+ * EXA_MIGRATION_GREEDY indicates to EXA that the driver prefers to -+ * use the "greedy" migration heuristic. This is to work around -+ * issues with EXA on the Intel 965 chipset. (LP: #177492) -+ */ -+#define EXA_MIGRATION_GREEDY (1 << 3) -+ -+/** - * EXA_HANDLES_PIXMAPS indicates to EXA that the driver can handle - * all pixmap addressing and migration. - */ diff --git a/packages/x11/xserver/xorg-server/patches/110_fedora_no_move_damage.diff b/packages/x11/xserver/xorg-server/patches/110_fedora_no_move_damage.diff deleted file mode 100644 index a1d676677a..0000000000 --- a/packages/x11/xserver/xorg-server/patches/110_fedora_no_move_damage.diff +++ /dev/null @@ -1,35 +0,0 @@ -Disable damage notifications on move for manually redirected windows. -The automatic compositor needs damage notification on move, but a -compositing manager doesn't. - -Index: xorg-server/composite/compwindow.c -=================================================================== ---- xorg-server.orig/composite/compwindow.c 2008-06-18 10:28:16.000000000 +0300 -+++ xorg-server/composite/compwindow.c 2008-06-18 12:06:20.000000000 +0300 -@@ -580,12 +580,15 @@ - } - else - { -+ CompWindowPtr cw = GetCompWindow (pWin); -+ - ptOldOrg.x -= dx; - ptOldOrg.y -= dy; - REGION_TRANSLATE (prgnSrc, prgnSrc, - pWin->drawable.x - ptOldOrg.x, - pWin->drawable.y - ptOldOrg.y); -- DamageRegionAppend(&pWin->drawable, prgnSrc); -+ if (pWin->redirectDraw && cw->update == CompositeRedirectAutomatic) -+ DamageRegionAppend(&pWin->drawable, prgnSrc); - } - cs->CopyWindow = pScreen->CopyWindow; - pScreen->CopyWindow = compCopyWindow; -@@ -664,7 +667,8 @@ - /* - * Report that as damaged so it will be redrawn - */ -- DamageRegionAppend(&pWin->drawable, &damage); -+ if (cw->update == CompositeRedirectAutomatic) -+ DamageRegionAppend(&pWin->drawable, &damage); - REGION_UNINIT (pScreen, &damage); - /* - * Save the new border clip region diff --git a/packages/x11/xserver/xorg-server/patches/156_exevents_copykeyclass_nullptrcheck.diff b/packages/x11/xserver/xorg-server/patches/156_exevents_copykeyclass_nullptrcheck.diff deleted file mode 100644 index d16c2f0384..0000000000 --- a/packages/x11/xserver/xorg-server/patches/156_exevents_copykeyclass_nullptrcheck.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur xorg-server-1.6.99.902.orig/Xi/exevents.c xorg-server-1.6.99.902/Xi/exevents.c ---- xorg-server-1.6.99.902.orig/Xi/exevents.c 2009-09-26 14:12:03.000000000 +0200 -+++ xorg-server-1.6.99.902/Xi/exevents.c 2009-09-26 18:55:30.000000000 +0200 -@@ -195,11 +195,15 @@ - static void - CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master) - { -- KeyClassPtr mk = master->key; -- KeyClassPtr dk = device->key; -+ KeyClassPtr mk, dk; - int i; - -- if (device == master) -+ if (device == master || device == NULL || master == NULL) -+ return; -+ -+ mk = master->key; -+ dk = device->key; -+ if (dk == NULL || mk == NULL) - return; - - mk->sourceid = device->id; diff --git a/packages/x11/xserver/xorg-server/patches/157_check_null_modes.diff b/packages/x11/xserver/xorg-server/patches/157_check_null_modes.diff deleted file mode 100644 index 7bdcb8b5da..0000000000 --- a/packages/x11/xserver/xorg-server/patches/157_check_null_modes.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c -index d855bd1..2af8c00 100644 ---- a/hw/xfree86/common/xf86VidMode.c -+++ b/hw/xfree86/common/xf86VidMode.c -@@ -226,6 +226,9 @@ VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock) - - pScrn = xf86Screens[scrnIndex]; - pVidMode = VMPTR(pScrn->pScreen); -+ if (pScrn->modes == NULL) -+ return FALSE; -+ - pVidMode->First = pScrn->modes; - pVidMode->Next = pVidMode->First->next; - diff --git a/packages/x11/xserver/xorg-server/patches/158_raise_maxclients.diff b/packages/x11/xserver/xorg-server/patches/158_raise_maxclients.diff deleted file mode 100644 index cc30d58b4e..0000000000 --- a/packages/x11/xserver/xorg-server/patches/158_raise_maxclients.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurp patched/include/misc.h working/include/misc.h ---- patched/include/misc.h 2009-02-05 01:09:03.000000000 -0800 -+++ working/include/misc.h 2009-02-05 02:12:57.000000000 -0800 -@@ -86,7 +86,7 @@ extern unsigned long serverGeneration; - #ifndef MAXSCREENS - #define MAXSCREENS 16 - #endif --#define MAXCLIENTS 256 -+#define MAXCLIENTS 512 - #define MAXEXTENSIONS 128 - #define MAXFORMATS 8 - #define MAXDEVICES 20 /* input devices */ diff --git a/packages/x11/xserver/xorg-server/patches/162_null_crtc_in_rotation.diff b/packages/x11/xserver/xorg-server/patches/162_null_crtc_in_rotation.diff deleted file mode 100644 index 2e4a9450d8..0000000000 --- a/packages/x11/xserver/xorg-server/patches/162_null_crtc_in_rotation.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nurp patched/hw/xfree86/modes/xf86RandR12.c working/hw/xfree86/modes/xf86RandR12.c ---- patched/hw/xfree86/modes/xf86RandR12.c 2009-03-02 22:57:18.000000000 -0800 -+++ working/hw/xfree86/modes/xf86RandR12.c 2009-03-02 22:57:24.000000000 -0800 -@@ -944,7 +944,8 @@ xf86RandR12SetRotations (ScreenPtr pScre - for (c = 0; c < config->num_crtc; c++) { - xf86CrtcPtr crtc = config->crtc[c]; - -- RRCrtcSetRotations (crtc->randr_crtc, rotations); -+ if (crtc != NULL) -+ RRCrtcSetRotations (crtc->randr_crtc, rotations); - } - #endif - randrp->supported_rotations = rotations; diff --git a/packages/x11/xserver/xorg-server/patches/164_trap-aspect-ratios.diff b/packages/x11/xserver/xorg-server/patches/164_trap-aspect-ratios.diff deleted file mode 100644 index aa6d5c2f6b..0000000000 --- a/packages/x11/xserver/xorg-server/patches/164_trap-aspect-ratios.diff +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c -index c0e3df9..32288f7 100644 ---- a/hw/xfree86/ddc/interpret_edid.c -+++ b/hw/xfree86/ddc/interpret_edid.c -@@ -51,6 +51,15 @@ static void get_whitepoint_section(Uchar *, struct whitePoints *); - static void get_detailed_timing_section(Uchar*, struct detailed_timings *); - static Bool validate_version(int scrnIndex, struct edid_version *); - -+static Bool -+is_standard_aspect_ratio(int x, int y) -+{ -+ return ((x == 16 && y == 9) || -+ (x == 16 && y == 10) || -+ (x == 4 && y == 3) || -+ (x == 5 && y == 4)); -+} -+ - static void - handle_edid_quirks(xf86MonPtr m) - { -@@ -91,10 +100,7 @@ handle_edid_quirks(xf86MonPtr m) - * try to find the largest detailed timing that matches that aspect - * ratio and use that to fill in the feature section. - */ -- if ((m->features.hsize == 16 && m->features.vsize == 9) || -- (m->features.hsize == 16 && m->features.vsize == 10) || -- (m->features.hsize == 4 && m->features.vsize == 3) || -- (m->features.hsize == 5 && m->features.vsize == 4)) { -+ if (is_standard_aspect_ratio(m->features.hsize, m->features.vsize)) { - int real_hsize = 0, real_vsize = 0; - float target_aspect, timing_aspect; - -@@ -130,6 +136,28 @@ handle_edid_quirks(xf86MonPtr m) - xf86Msg(X_INFO, "Quirked EDID physical size to %dx%d cm\n", - m->features.hsize, m->features.vsize); - } -+ -+ /* -+ * Some monitors do the reverse, putting real size in the global block -+ * and aspect ratios in the detailed timings. Check, but only if we -+ * think we've got a real physical size. -+ */ -+ if (m->features.hsize && m->features.vsize) { -+ for (i = 0; i < 4; i++) { -+ if (m->det_mon[i].type == DT) { -+ struct detailed_timings *timing; -+ timing = &m->det_mon[i].section.d_timings; -+ -+ if (is_standard_aspect_ratio(timing->h_size, timing->v_size)) { -+ timing->h_size = m->features.hsize * 10; -+ timing->v_size = m->features.vsize * 10; -+ xf86Msg(X_INFO, "Quirked timing size to %dx%d mm\n", -+ timing->h_size, timing->v_size); -+ -+ } -+ } -+ } -+ } - } - - xf86MonPtr diff --git a/packages/x11/xserver/xorg-server/patches/166_nullptr_xinerama_keyrepeat.diff b/packages/x11/xserver/xorg-server/patches/166_nullptr_xinerama_keyrepeat.diff deleted file mode 100644 index 75dbf5d458..0000000000 --- a/packages/x11/xserver/xorg-server/patches/166_nullptr_xinerama_keyrepeat.diff +++ /dev/null @@ -1,30 +0,0 @@ -From f0ef98d8d54f5dfa3081b62ff672e0fe992b0a01 Mon Sep 17 00:00:00 2001 -From: Bryce Harrington -Date: Wed, 18 Mar 2009 23:28:51 -0700 -Subject: [PATCH] Check for null pointer dereference to prevent crash - on non-primary Xinerama screens when key repeating. - (LP: #324465) - -Signed-off-by: Bryce Harrington ---- - mi/mipointer.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/mi/mipointer.c b/mi/mipointer.c -index e37316e..fe5947f 100644 ---- a/mi/mipointer.c -+++ b/mi/mipointer.c -@@ -306,6 +306,10 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) - pPointer = MIPOINTER(pDev); - SetupScreen (pScreen); - -+ /* Null pointer causes crash on keyrepeat with Xinerama LP: (#324465) */ -+ if (pPointer == NULL) -+ return; -+ - if (pPointer->pScreen != pScreen) - { - (*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, TRUE); --- -1.6.0.4 - diff --git a/packages/x11/xserver/xorg-server/patches/167_nullptr_xisbread.diff b/packages/x11/xserver/xorg-server/patches/167_nullptr_xisbread.diff deleted file mode 100644 index 38921dd4bf..0000000000 --- a/packages/x11/xserver/xorg-server/patches/167_nullptr_xisbread.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nurp patched/hw/xfree86/common/xisb.c working/hw/xfree86/common/xisb.c ---- patched/hw/xfree86/common/xisb.c 2009-02-02 21:53:58.000000000 +0100 -+++ working/hw/xfree86/common/xisb.c 2009-02-02 21:55:09.000000000 +0100 -@@ -98,6 +98,9 @@ XisbRead (XISBuffer *b) - { - int ret; - -+ if (b == NULL) -+ return -2; -+ - if (b->current >= b->end) - { - if (b->block_duration >= 0) diff --git a/packages/x11/xserver/xorg-server/patches/169_mipointer_nullptr_checks.diff b/packages/x11/xserver/xorg-server/patches/169_mipointer_nullptr_checks.diff deleted file mode 100644 index 6484fe0152..0000000000 --- a/packages/x11/xserver/xorg-server/patches/169_mipointer_nullptr_checks.diff +++ /dev/null @@ -1,107 +0,0 @@ -From 179cec1d2f919d8d8096d6030b0ad9b6285dfd4d Mon Sep 17 00:00:00 2001 -From: Bryce Harrington -Date: Mon, 23 Mar 2009 14:25:18 -0700 -Subject: [PATCH] Check null pointers to not crash on keyrepeat with Xinerama LP: (#324465) - -With -nvidia, when using Xinerama, holding down a key in a text field -on a non-primary screen can cause an X crash. This is caused because -the MIPOINTER(pDev) can return a NULL pointer for a non-null pDev in -some cases, and the mipointer.c code lacks checks for this condition. - -MIPOINTER() is a macro #defined locally to mipointer.c, which calls into -dixLookupPrivate(), a routine which returns NULL in at least some -circumstances - such as if the memory could not be xcalloc'd for -whatever reason. Hopefully upstream can provide a better fix for this, -but for now it seems reasonable to check the return values of this macro -for NULL before usage, as a minimum. - -diff -Naur xorg-server-1.6.99.902.orig/mi/mipointer.c xorg-server-1.6.99.902/mi/mipointer.c ---- xorg-server-1.6.99.902.orig/mi/mipointer.c 2009-09-26 14:12:02.000000000 +0200 -+++ xorg-server-1.6.99.902/mi/mipointer.c 2009-09-26 19:02:00.000000000 +0200 -@@ -139,6 +139,10 @@ - if (DevHasCursor(pDev)) - { - pPointer = MIPOINTER(pDev); -+ if (pPointer == NULL) { -+ ErrorF("miPointerCloseScreen: Invalid input device pointer\n"); -+ return FALSE; -+ } - - if (pScreen == pPointer->pScreen) - pPointer->pScreen = 0; -@@ -191,6 +195,10 @@ - return FALSE; - - pPointer = MIPOINTER(pDev); -+ if (pPointer == NULL) { -+ ErrorF("miPointerDisplayCursor: Invalid input device pointer\n"); -+ return FALSE; -+ } - - pPointer->pCursor = pCursor; - pPointer->pScreen = pScreen; -@@ -204,6 +212,10 @@ - miPointerPtr pPointer; - - pPointer = MIPOINTER(pDev); -+ if (pPointer == NULL) { -+ ErrorF("miPointerConstrainCursor: Invalid input device pointer\n"); -+ return FALSE; -+ } - - pPointer->limits = *pBox; - pPointer->confined = PointerConfinedToScreen(pDev); -@@ -305,6 +317,10 @@ - - SetupScreen (pScreen); - pPointer = MIPOINTER(pDev); -+ if (pPointer == NULL) { -+ ErrorF("miPointerWarpCursor: Invalid input device pointer\n"); -+ return; -+ } - - if (pPointer->pScreen != pScreen) - { -@@ -436,13 +452,17 @@ - ScreenPtr pScreen; - miPointerPtr pPointer; - -- pPointer = MIPOINTER(pDev); -- - pScreen = screenInfo.screens[screen_no]; - pScreenPriv = GetScreenPrivate (pScreen); - (*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, FALSE); - NewCurrentScreen (pDev, pScreen, x, y); - -+ pPointer = MIPOINTER(pDev); -+ if (pPointer == NULL) { -+ ErrorF("miPointerSetScreen: Invalid input device pointer\n"); -+ return; -+ } -+ - pPointer->limits.x2 = pScreen->width; - pPointer->limits.y2 = pScreen->height; - } -@@ -469,6 +489,10 @@ - SetupScreen(pScreen); - - pPointer = MIPOINTER(pDev); -+ if (pPointer == NULL) { -+ ErrorF("miPointerMoved: Invalid input device pointer\n"); -+ return; -+ } - - /* Hack: We mustn't call into ->MoveCursor for anything but the - * VCP, as this may cause a non-HW rendered cursor to be rendered during -@@ -498,6 +522,11 @@ - miPointerPtr pPointer; - - pPointer = MIPOINTER(pDev); -+ if (pPointer == NULL) { -+ ErrorF("miPointerSetPosition: Invalid input device pointer\n"); -+ return; -+ } -+ - pScreen = pPointer->pScreen; - if (!pScreen) - return; /* called before ready */ diff --git a/packages/x11/xserver/xorg-server/patches/172_cwgetbackingpicture_nullptr_check.diff b/packages/x11/xserver/xorg-server/patches/172_cwgetbackingpicture_nullptr_check.diff deleted file mode 100644 index 9a91113aea..0000000000 --- a/packages/x11/xserver/xorg-server/patches/172_cwgetbackingpicture_nullptr_check.diff +++ /dev/null @@ -1,39 +0,0 @@ -From 7813adf66be31d8b0e8df21821e786e688f7fe78 Mon Sep 17 00:00:00 2001 -From: Bryce Harrington -Date: Fri, 27 Mar 2009 19:01:32 -0700 -Subject: [PATCH] cwGetBackingPicture can segfault when minimizing/maximizing firefox with - a flash video playing. This appears to be a race condition in which the - backing picture's data is not always fully defined. - -Signed-off-by: Bryce Harrington ---- - miext/cw/cw_render.c | 13 +++++++++---- - 1 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/miext/cw/cw_render.c b/miext/cw/cw_render.c -index 6e0c727..fe8cba7 100644 ---- a/miext/cw/cw_render.c -+++ b/miext/cw/cw_render.c -@@ -125,10 +125,15 @@ cwGetBackingPicture (PicturePtr pPicture, int *x_off, int *y_off) - WindowPtr pWindow = (WindowPtr) pDrawable; - PixmapPtr pPixmap = getCwPixmap (pWindow); - -- *x_off = pDrawable->x - pPixmap->screen_x; -- *y_off = pDrawable->y - pPixmap->screen_y; -- -- return pPicturePrivate->pBackingPicture; -+ if (pDrawable && pPixmap) { -+ *x_off = pDrawable->x - pPixmap->screen_x; -+ *y_off = pDrawable->y - pPixmap->screen_y; -+ -+ return pPicturePrivate->pBackingPicture; -+ } else { -+ *x_off = *y_off = 0; -+ return pPicture; -+ } - } - else - { --- -1.6.0.4 - diff --git a/packages/x11/xserver/xorg-server/patches/173_edid_quirk_philips_lcd.diff b/packages/x11/xserver/xorg-server/patches/173_edid_quirk_philips_lcd.diff deleted file mode 100644 index ba735bd0bb..0000000000 --- a/packages/x11/xserver/xorg-server/patches/173_edid_quirk_philips_lcd.diff +++ /dev/null @@ -1,21 +0,0 @@ -# -# Ubuntu: https://bugs.launchpad.net/bugs/353074 -# Upstream: http://bugs.freedesktop.org/show_bug.cgi?id=21000 -# - -Index: xorg-server-1.6.0/hw/xfree86/modes/xf86EdidModes.c -=================================================================== ---- xorg-server-1.6.0.orig/hw/xfree86/modes/xf86EdidModes.c 2009-04-01 19:45:23.000000000 +0200 -+++ xorg-server-1.6.0/hw/xfree86/modes/xf86EdidModes.c 2009-04-01 19:45:32.000000000 +0200 -@@ -155,6 +155,11 @@ - DDC->vendor.prod_id == 13600) - return TRUE; - -+ /* Bug #21000: LGPhilipsLCD LP154W01-TLAJ */ -+ if (memcmp (DDC->vendor.name, "LPL", 4) == 0 && -+ DDC->vendor.prod_id == 47360) -+ return TRUE; -+ - return FALSE; - } - diff --git a/packages/x11/xserver/xorg-server/patches/180_fedora_no_synaptics_mouse_synthesis.diff b/packages/x11/xserver/xorg-server/patches/180_fedora_no_synaptics_mouse_synthesis.diff deleted file mode 100644 index ddf3961196..0000000000 --- a/packages/x11/xserver/xorg-server/patches/180_fedora_no_synaptics_mouse_synthesis.diff +++ /dev/null @@ -1,16 +0,0 @@ -From 8663524ce398b56af596ab1e7e96b62ca45b79e9 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 13 Apr 2009 17:49:00 +1000 -Subject: [PATCH] xfree86: don't synthesise a mouse section if synaptics devices are found. - -diff -Naur xorg-server-1.6.99.902.orig/hw/xfree86/common/xf86Config.c xorg-server-1.6.99.902/hw/xfree86/common/xf86Config.c ---- xorg-server-1.6.99.902.orig/hw/xfree86/common/xf86Config.c 2009-09-26 14:12:03.000000000 +0200 -+++ xorg-server-1.6.99.902/hw/xfree86/common/xf86Config.c 2009-09-26 19:05:52.000000000 +0200 -@@ -2406,6 +2406,7 @@ - { - if (strcmp((*dev)->driver, "kbd") == 0 || - strcmp((*dev)->driver, "mouse") == 0 || -+ strcmp((*dev)->driver, "synaptics") == 0 || - strcmp((*dev)->driver, "vmmouse") == 0) - { - IDevPtr *current; diff --git a/packages/x11/xserver/xorg-server/patches/201_fedora-pci-primary.diff b/packages/x11/xserver/xorg-server/patches/201_fedora-pci-primary.diff deleted file mode 100644 index 61ba6db30b..0000000000 --- a/packages/x11/xserver/xorg-server/patches/201_fedora-pci-primary.diff +++ /dev/null @@ -1,91 +0,0 @@ -diff -Naur xorg-server-1.6.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.6.99.902/hw/xfree86/common/xf86pciBus.c ---- xorg-server-1.6.99.902.orig/hw/xfree86/common/xf86pciBus.c 2009-09-26 14:12:03.000000000 +0200 -+++ xorg-server-1.6.99.902/hw/xfree86/common/xf86pciBus.c 2009-09-26 19:11:42.000000000 +0200 -@@ -52,13 +52,7 @@ - /* Bus-specific globals */ - Bool pciSlotClaimed = FALSE; - --#define PCIINFOCLASSES(c) \ -- ( (((c) & 0x00ff0000) == (PCI_CLASS_PREHISTORIC << 16)) \ -- || (((c) & 0x00ff0000) == (PCI_CLASS_DISPLAY << 16)) \ -- || ((((c) & 0x00ffff00) \ -- == ((PCI_CLASS_MULTIMEDIA << 16) | (PCI_SUBCLASS_MULTIMEDIA_VIDEO << 8)))) \ -- || ((((c) & 0x00ffff00) \ -- == ((PCI_CLASS_PROCESSOR << 16) | (PCI_SUBCLASS_PROCESSOR_COPROC << 8)))) ) -+#define PCIINFOCLASSES(c) (((c) & 0x00ffff00) == (PCI_CLASS_DISPLAY << 16)) - - /* - * PCI classes that have messages printed always. The others are only -@@ -85,6 +79,40 @@ - sprintf(buffer, "%d@%d", busnum & 0x00ff, busnum >> 8); - } - -+/* oh god what have i done */ -+static Bool -+looks_like_bios_primary(struct pci_device *info) -+{ -+ unsigned char *bios; -+ unsigned short vendor, device; -+ int offset; -+ Bool ret = FALSE; -+ -+ bios = xf86MapVidMem(-1, VIDMEM_MMIO, 0xc0000, 0x10000); -+ if (!bios) -+ return FALSE; -+ -+ if (bios[0] != 0x55 || bios[1] != 0xAA) -+ goto out; -+ -+ offset = (bios[0x19] << 8) + bios[0x18]; -+ -+ if (bios[offset] != 'P' || -+ bios[offset+1] != 'C' || -+ bios[offset+2] != 'I' || -+ bios[offset+3] != 'R') -+ goto out; -+ -+ vendor = (bios[offset+5] << 8) + bios[offset+4]; -+ device = (bios[offset+7] << 8) + bios[offset+6]; -+ -+ ret = (info->vendor_id == vendor) && (info->device_id == device); -+ -+out: -+ xf86UnMapVidMem(-1, bios, 0x10000); -+ return ret; -+} -+ - /* - * xf86Bus.c interface - */ -@@ -132,17 +160,25 @@ - uint16_t command; - - info = xf86PciVideoInfo[i]; -+ if (!IS_VGA(info->device_class)) -+ continue; -+ - pci_device_cfg_read_u16(info, & command, 4); - -- if ((command & PCI_CMD_MEM_ENABLE) -- && ((num == 1) || IS_VGA(info->device_class))) { -- if (primaryBus.type == BUS_NONE) { -+ if ((command & PCI_CMD_MEM_ENABLE)) { -+ if (num == 1) { - primaryBus.type = BUS_PCI; - primaryBus.id.pci = info; -- } else { -- xf86Msg(X_NOTICE, -+ break; -+ } else if (looks_like_bios_primary(info)) { -+ if (primaryBus.type == BUS_NONE) { -+ primaryBus.type = BUS_PCI; -+ primaryBus.id.pci = info; -+ } else { -+ xf86Msg(X_NOTICE, - "More than one possible primary device found\n"); -- primaryBus.type ^= (BusType)(-1); -+ primaryBus.type ^= (BusType)(-1); -+ } - } - } - } diff --git a/packages/x11/xserver/xorg-server/patches/30_typedef-apm-2.6.24.diff b/packages/x11/xserver/xorg-server/patches/30_typedef-apm-2.6.24.diff deleted file mode 100644 index 96adefd18b..0000000000 --- a/packages/x11/xserver/xorg-server/patches/30_typedef-apm-2.6.24.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xorg-server-1.4.0.90/hw/xfree86/os-support/linux/lnx_apm.c xorg-server-1.4.0.90.edit/hw/xfree86/os-support/linux/lnx_apm.c ---- xorg-server-1.4.0.90/hw/xfree86/os-support/linux/lnx_apm.c 2007-12-14 00:38:23.000000000 +0100 -+++ xorg-server-1.4.0.90.edit/hw/xfree86/os-support/linux/lnx_apm.c 2007-12-14 00:38:18.000000000 +0100 -@@ -35,6 +35,8 @@ - # define APM_SUSPEND_FAILED 0xf001 - #endif - -+typedef unsigned short apm_event_t; -+ - static PMClose lnxAPMOpen(void); - static void lnxCloseAPM(void); - static pointer APMihPtr = NULL; diff --git a/packages/x11/xserver/xorg-server/patches/60_use-proc-instead-of-sysfs-for-pci-domains.diff b/packages/x11/xserver/xorg-server/patches/60_use-proc-instead-of-sysfs-for-pci-domains.diff deleted file mode 100644 index ddc8ece453..0000000000 --- a/packages/x11/xserver/xorg-server/patches/60_use-proc-instead-of-sysfs-for-pci-domains.diff +++ /dev/null @@ -1,32 +0,0 @@ -/* Upstream commit 56f21bda1ce95741c88c423b60bd709eef26eb12 was supposed to - * only avoid multiple scans of the PCI devices, but it actually also added - * an "optimization" based on using sysfs files instead of /proc. However, - * this code is broken, for instance because there are no ioctl handler on - * /sys/bus/pci/devices/*/config files while there some on /proc/bus/pci/* - * - * It breaks the Xserver on architectures that require such ioctls to scan - * the PCI devices and/or deal with PCI domains: - * #422077: xserver-xorg: Fatal server error on sparc: xf86MapPciMem failed - * #422095: xserver-xorg-core: fails to start on powerpc, no devices detected - * - * The following patch forces the server to behave as if we were running on - * a 2.4 kernel while scanning PCI devices, so that the sysfs code is disabled. - * - * Upstream doesn't apply this patch since they want to fix the sysfs-code. - * See https://bugs.freedesktop.org/show_bug.cgi?id=7248 - * - * Thanks to Jim Watson for testing! - */ - -diff -Naur xorg-server-1.5.1.orig/hw/xfree86/os-support/bus/linuxPci.c xorg-server-1.5.1/hw/xfree86/os-support/bus/linuxPci.c ---- xorg-server-1.5.1.orig/hw/xfree86/os-support/bus/linuxPci.c 2008-10-04 18:50:24.000000000 +0200 -+++ xorg-server-1.5.1/hw/xfree86/os-support/bus/linuxPci.c 2008-10-04 18:52:08.000000000 +0200 -@@ -131,7 +131,7 @@ - static int fd = -1,is_write = 0; - char file[64]; - struct stat ignored; -- static int is26 = -1; -+ static int is26 = 0; - - if (dev == NULL) { - return -1; diff --git a/packages/x11/xserver/xorg-server/patches/66_only-switch-vt-when-active.diff b/packages/x11/xserver/xorg-server/patches/66_only-switch-vt-when-active.diff deleted file mode 100644 index d066e6dc29..0000000000 --- a/packages/x11/xserver/xorg-server/patches/66_only-switch-vt-when-active.diff +++ /dev/null @@ -1,32 +0,0 @@ -Index: xorg-server/hw/xfree86/os-support/linux/lnx_init.c -=================================================================== ---- xorg-server.orig/hw/xfree86/os-support/linux/lnx_init.c 2008-06-18 12:06:06.000000000 +0300 -+++ xorg-server/hw/xfree86/os-support/linux/lnx_init.c 2008-06-18 12:06:25.000000000 +0300 -@@ -344,10 +344,25 @@ - - if (VTSwitch) - { -+ struct vt_stat vts; -+ - /* -- * Perform a switch back to the active VT when we were started -+ * Perform a switch back to the active VT when we were started. -+ * We cannot rely on vtSema to determine if the server was the -+ * active VT at the time of shutdown since it has already been -+ * released. Instead, we manually check the current VT and -+ * compare it with the VT we were running on. - */ -- if (activeVT >= 0) { -+ if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts) < 0) -+ { -+ /* If this failed, fall back to old behaviour -+ * of always switching. */ -+ xf86Msg(X_WARNING,"xf86OpenConsole: VT_GETSTATE failed: %s\n", -+ strerror(errno)); -+ vts.v_active = xf86Info.vtno; -+ } -+ -+ if (activeVT >= 0 && vts.v_active == xf86Info.vtno) { - if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, activeVT) < 0) - xf86Msg(X_WARNING, "xf86CloseConsole: VT_ACTIVATE failed: %s\n", - strerror(errno)); diff --git a/packages/x11/xserver/xorg-server/patches/use-sloppy-heuristic-first-for-initial-mode.diff b/packages/x11/xserver/xorg-server/patches/use-sloppy-heuristic-first-for-initial-mode.diff new file mode 100644 index 0000000000..4960634cd1 --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/use-sloppy-heuristic-first-for-initial-mode.diff @@ -0,0 +1,17 @@ +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 84d3cac..673612f 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -2248,10 +2248,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); + else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height)) + xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); +- else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) +- xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n"); + else if (xf86TargetFallback(scrn, config, modes, enabled, width, height)) + xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n"); ++ else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) ++ xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n"); + else + xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n"); + diff --git a/packages/x11/xserver/xorg-server/patches/xorg-x11-nonroot-vesa.diff b/packages/x11/xserver/xorg-server/patches/xorg-x11-nonroot-vesa.diff new file mode 100644 index 0000000000..76c0a38aa4 --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/xorg-x11-nonroot-vesa.diff @@ -0,0 +1,12 @@ +--- xorg-server-1.6.1.901/hw/xfree86/common/xf86AutoConfig.c~ 2009-07-03 11:59:30.000000000 -0700 ++++ xorg-server-1.6.1.901/hw/xfree86/common/xf86AutoConfig.c 2009-07-03 11:59:30.000000000 -0700 +@@ -516,7 +516,8 @@ + /* Fallback to platform default hardware */ + if (i < (nmatches - 1)) { + #if defined(__i386__) || defined(__amd64__) || defined(__hurd__) +- matches[i++] = xnfstrdup("vesa"); ++ if (geteuid() == 0) ++ matches[i++] = xnfstrdup("vesa"); + #elif defined(__sparc__) && !defined(sun) + matches[i++] = xnfstrdup("sunffb"); + #endif diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.patch b/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.diff similarity index 88% rename from packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.patch rename to packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.diff index 097b085a32..ae65d0be4c 100644 --- a/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.patch +++ b/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.diff @@ -1,6 +1,6 @@ -From b4e4b980663692a3af5787eeaf2d48eb6c0188ed Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas -Date: Tue, 4 Aug 2009 14:45:58 +1000 +From eff3bb9c6f0b71a57705885a3fe6e6469d252d2b Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas +Date: Wed, 20 Jan 2010 14:46:12 +1300 Subject: [PATCH] Add nr for background=none root --- @@ -25,7 +25,7 @@ index c24a94f..907a5e8 100644 int cursorScreenDevPriv[MAXSCREENS]; diff --git a/dix/window.c b/dix/window.c -index 32e26d9..0bf1d52 100644 +index caff1cb..be1d1c4 100644 --- a/dix/window.c +++ b/dix/window.c @@ -466,22 +466,24 @@ InitRootWindow(WindowPtr pWin) @@ -59,7 +59,7 @@ index 32e26d9..0bf1d52 100644 MapWindow(pWin, serverClient); } diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c -index e84da4e..2a0f47a 100644 +index 6707448..776b898 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -77,6 +77,7 @@ @@ -70,7 +70,7 @@ index e84da4e..2a0f47a 100644 #include "xf86VGAarbiter.h" #include "globals.h" -@@ -234,6 +235,7 @@ xf86CreateRootWindow(WindowPtr pWin) +@@ -254,6 +255,7 @@ xf86CreateRootWindow(WindowPtr pWin) int ret = TRUE; int err = Success; ScreenPtr pScreen = pWin->drawable.pScreen; @@ -78,7 +78,7 @@ index e84da4e..2a0f47a 100644 RootWinPropPtr pProp; CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr) dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey); -@@ -285,6 +287,15 @@ xf86CreateRootWindow(WindowPtr pWin) +@@ -305,6 +307,15 @@ xf86CreateRootWindow(WindowPtr pWin) } } @@ -95,10 +95,10 @@ index e84da4e..2a0f47a 100644 return (ret); } diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h -index 5c3ee44..e3c7841 100644 +index de1f1b6..5c3aa00 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h -@@ -516,7 +516,7 @@ typedef struct _confdrirec { +@@ -503,7 +503,7 @@ typedef struct _confdrirec { } confDRIRec, *confDRIPtr; /* These values should be adjusted when new fields are added to ScrnInfoRec */ @@ -107,8 +107,8 @@ index 5c3ee44..e3c7841 100644 #define NUM_RESERVED_POINTERS 14 #define NUM_RESERVED_FUNCS 11 -@@ -800,6 +800,9 @@ typedef struct _ScrnInfoRec { - ClockRangesPtr clockRanges; +@@ -775,6 +775,9 @@ typedef struct _ScrnInfoRec { + ClockRangePtr clockRanges; int adjustFlags; + /* -nr support */ @@ -130,10 +130,10 @@ index b3c7c70..fcc8c95 100644 extern _X_EXPORT Bool CoreDump; diff --git a/os/utils.c b/os/utils.c -index 00abd63..7bfdf8b 100644 +index d7c8388..40583d0 100644 --- a/os/utils.c +++ b/os/utils.c -@@ -514,6 +514,7 @@ void UseMsg(void) +@@ -513,6 +513,7 @@ void UseMsg(void) #endif ErrorF("-nolisten string don't listen on protocol\n"); ErrorF("-noreset don't reset after last client exists\n"); @@ -141,7 +141,7 @@ index 00abd63..7bfdf8b 100644 ErrorF("-reset reset after last client exists\n"); ErrorF("-p # screen-saver pattern duration (minutes)\n"); ErrorF("-pn accept failure to listen on all ports\n"); -@@ -861,6 +862,8 @@ ProcessCommandLine(int argc, char *argv[]) +@@ -856,6 +857,8 @@ ProcessCommandLine(int argc, char *argv[]) defaultBackingStore = WhenMapped; else if ( strcmp( argv[i], "-wr") == 0) whiteRoot = TRUE; @@ -151,5 +151,5 @@ index 00abd63..7bfdf8b 100644 if(++i < argc) { long reqSizeArg = atol(argv[i]); -- -1.6.0.6 +1.6.6 diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch b/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch deleted file mode 100644 index c6178b879b..0000000000 --- a/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch +++ /dev/null @@ -1,32 +0,0 @@ -From dc5cedd61e00afec33cbfaa7fdfbb6c357074dbd Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= -Date: Thu, 11 Sep 2008 12:51:31 -0400 -Subject: [PATCH] Make room for an external monitor if we have enough video RAM - ---- - hw/xfree86/modes/xf86Crtc.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 4de7e05..9bcf81b 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -987,6 +987,15 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp, - if (crtc_height > height) - height = crtc_height; - } -+ -+ /* Make room for an external monitor if we have enough video ram */ -+ if (scrn->videoRam >= 65536) -+ width += 1920; -+ else if (scrn->videoRam >= 32768) -+ width += 1280; -+ else if (scrn->videoRam >= 16384) -+ width += 1024; -+ - if (config->maxWidth && width > config->maxWidth) width = config->maxWidth; - if (config->maxHeight && height > config->maxHeight) height = config->maxHeight; - if (config->minWidth && width < config->minWidth) width = config->minWidth; --- -1.6.0.1 - diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.5.1-mode-debug.patch b/packages/x11/xserver/xorg-server/patches/xserver-1.5.1-mode-debug.patch deleted file mode 100644 index 11fe5adac9..0000000000 --- a/packages/x11/xserver/xorg-server/patches/xserver-1.5.1-mode-debug.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 079910986a1b8f5042e16ee2ba3ad9ed843b67ca Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 7 Oct 2008 11:09:14 -0400 -Subject: [PATCH] Force ModeDebug on. - ---- - hw/xfree86/modes/xf86Crtc.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 9bcf81b..a953c8a 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -2084,8 +2084,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) - xf86ProcessOptions (scrn->scrnIndex, - scrn->options, - config->options); -- config->debug_modes = xf86ReturnOptValBool (config->options, -- OPTION_MODEDEBUG, FALSE); -+ config->debug_modes = TRUE; - - if (scrn->display->virtualX) - width = scrn->display->virtualX; --- -1.6.0.1 - diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch b/packages/x11/xserver/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch deleted file mode 100644 index cc80e6cef4..0000000000 --- a/packages/x11/xserver/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Wed, 11 Mar 2009 14:02:11 -0400 -Subject: [PATCH] Don't build the ACPI code. - -No good can come of this. ---- - configure.ac | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 72ae67e..04716f8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then - case $host_cpu in - ia64*) - linux_ia64=yes -- linux_acpi="yes" - ;; - alpha*) - linux_alpha=yes - ;; - i*86|amd64*|x86_64*) -- linux_acpi="yes" - ;; - *) - ;; --- -1.6.1.3 - diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.7.0-glx-versioning.patch b/packages/x11/xserver/xorg-server/patches/xserver-1.7.0-glx-versioning.patch deleted file mode 100644 index c8a1c30954..0000000000 --- a/packages/x11/xserver/xorg-server/patches/xserver-1.7.0-glx-versioning.patch +++ /dev/null @@ -1,233 +0,0 @@ -From 3ef4be8129f78afd5566a9e5d0fb901449dcb771 Mon Sep 17 00:00:00 2001 -From: Ian Romanick -Date: Tue, 29 Sep 2009 16:43:43 -0700 -Subject: [PATCH] GLX: Enable GLX 1.4 on DRI2 - -this squashes 4 commits -(cherry picked from commit ad5c0d9efa47476ed5cf75c82265c73919e468b4) -(cherry picked from commit cb54cf1b3e8c4109541cfb698542c00f2473e731) -(cherry picked from commit 4c6bfa2c09ae2b0cffdf9211a6dfbcaefe0366b5) -(cherry picked from commit 9bf2ff4faf730913de3073f346646a8727be41d4) ---- - glx/glxcmds.c | 12 ++++++++---- - glx/glxdri2.c | 12 ++++++++++++ - glx/glxext.c | 8 +++++++- - glx/glxscreens.c | 15 ++++++++++++--- - glx/glxscreens.h | 11 +++++++++++ - glx/glxserver.h | 3 +++ - glx/indirect_texture_compression.c | 4 ++-- - include/protocol-versions.h | 2 +- - 8 files changed, 56 insertions(+), 11 deletions(-) - -diff --git a/glx/glxcmds.c b/glx/glxcmds.c -index b1061a8..ba4c123 100644 ---- a/glx/glxcmds.c -+++ b/glx/glxcmds.c -@@ -50,7 +50,6 @@ - #include "indirect_dispatch.h" - #include "indirect_table.h" - #include "indirect_util.h" --#include "protocol-versions.h" - - static int - validGlxScreen(ClientPtr client, int screen, __GLXscreen **pGlxScreen, int *err) -@@ -739,8 +738,8 @@ int __glXDisp_QueryVersion(__GLXclientState *cl, GLbyte *pc) - ** client if it wants to work with older clients; however, in this - ** implementation the server just returns its version number. - */ -- reply.majorVersion = SERVER_GLX_MAJOR_VERSION; -- reply.minorVersion = SERVER_GLX_MINOR_VERSION; -+ reply.majorVersion = glxMajorVersion; -+ reply.minorVersion = glxMinorVersion; - reply.length = 0; - reply.type = X_Reply; - reply.sequenceNumber = client->sequence; -@@ -2360,6 +2359,7 @@ int __glXDisp_QueryServerString(__GLXclientState *cl, GLbyte *pc) - char *buf; - __GLXscreen *pGlxScreen; - int err; -+ char ver_str[16]; - - if (!validGlxScreen(client, req->screen, &pGlxScreen, &err)) - return err; -@@ -2369,7 +2369,11 @@ int __glXDisp_QueryServerString(__GLXclientState *cl, GLbyte *pc) - ptr = pGlxScreen->GLXvendor; - break; - case GLX_VERSION: -- ptr = pGlxScreen->GLXversion; -+ /* Return to the server version rather than the screen version -+ * to prevent confusion when they do not match. -+ */ -+ snprintf(ver_str, 16, "%d.%d", glxMajorVersion, glxMinorVersion); -+ ptr = ver_str; - break; - case GLX_EXTENSIONS: - ptr = pGlxScreen->GLXextensions; -diff --git a/glx/glxdri2.c b/glx/glxdri2.c -index ed7fb4c..ed7dc80 100644 ---- a/glx/glxdri2.c -+++ b/glx/glxdri2.c -@@ -685,6 +685,18 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - screen->base.GLXextensions); - } - -+ /* We're going to assume (perhaps incorrectly?) that all DRI2-enabled -+ * drivers support the required extensions for GLX 1.4. The extensions -+ * we're assuming are: -+ * -+ * - GLX_SGI_make_current_read (1.3) -+ * - GLX_SGIX_fbconfig (1.3) -+ * - GLX_SGIX_pbuffer (1.3) -+ * - GLX_ARB_multisample (1.4) -+ */ -+ screen->base.GLXmajor = 1; -+ screen->base.GLXminor = 4; -+ - screen->enterVT = pScrn->EnterVT; - pScrn->EnterVT = glxDRIEnterVT; - screen->leaveVT = pScrn->LeaveVT; -diff --git a/glx/glxext.c b/glx/glxext.c -index 19d70d4..9f9c0ed 100644 ---- a/glx/glxext.c -+++ b/glx/glxext.c -@@ -360,12 +360,18 @@ void GlxExtensionInit(void) - pScreen = screenInfo.screens[i]; - - for (p = __glXProviderStack; p != NULL; p = p->next) { -- if (p->screenProbe(pScreen) != NULL) { -+ __GLXscreen *glxScreen; -+ -+ glxScreen = p->screenProbe(pScreen); -+ if (glxScreen != NULL) { -+ if (glxScreen->GLXminor < glxMinorVersion) -+ glxMinorVersion = glxScreen->GLXminor; - LogMessage(X_INFO, - "GLX: Initialized %s GL provider for screen %d\n", - p->name, i); - break; - } -+ - } - - if (!p) -diff --git a/glx/glxscreens.c b/glx/glxscreens.c -index 7d29d31..674e2c6 100644 ---- a/glx/glxscreens.c -+++ b/glx/glxscreens.c -@@ -42,6 +42,7 @@ - #include "glxserver.h" - #include "glxutil.h" - #include "glxext.h" -+#include "protocol-versions.h" - - static int glxScreenPrivateKeyIndex; - static DevPrivateKey glxScreenPrivateKey = &glxScreenPrivateKeyIndex; -@@ -162,7 +163,8 @@ static const char GLServerExtensions[] = - ** supported across all screens in a multi-screen system. - */ - static char GLXServerVendorName[] = "SGI"; --static char GLXServerVersion[] = "1.2"; -+unsigned glxMajorVersion = SERVER_GLX_MAJOR_VERSION; -+unsigned glxMinorVersion = SERVER_GLX_MINOR_VERSION; - static char GLXServerExtensions[] = - "GLX_ARB_multisample " - "GLX_EXT_visual_info " -@@ -378,9 +380,17 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen) - pGlxScreen->pScreen = pScreen; - pGlxScreen->GLextensions = xstrdup(GLServerExtensions); - pGlxScreen->GLXvendor = xstrdup(GLXServerVendorName); -- pGlxScreen->GLXversion = xstrdup(GLXServerVersion); - pGlxScreen->GLXextensions = xstrdup(GLXServerExtensions); - -+ /* All GLX providers must support all of the functionality required for at -+ * least GLX 1.2. If the provider supports a higher version, the GLXminor -+ * version can be changed in the provider's screen-probe routine. For -+ * most providers, the screen-probe routine is the caller of this -+ * function. -+ */ -+ pGlxScreen->GLXmajor = 1; -+ pGlxScreen->GLXminor = 2; -+ - pGlxScreen->CloseScreen = pScreen->CloseScreen; - pScreen->CloseScreen = glxCloseScreen; - pGlxScreen->DestroyWindow = pScreen->DestroyWindow; -@@ -454,7 +464,6 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen) - void __glXScreenDestroy(__GLXscreen *screen) - { - xfree(screen->GLXvendor); -- xfree(screen->GLXversion); - xfree(screen->GLXextensions); - xfree(screen->GLextensions); - } -diff --git a/glx/glxscreens.h b/glx/glxscreens.h -index 3c1bdd4..bff4363 100644 ---- a/glx/glxscreens.h -+++ b/glx/glxscreens.h -@@ -161,6 +161,17 @@ struct __GLXscreen { - char *GLXversion; - char *GLXextensions; - -+ /** -+ * \name GLX version supported by this screen. -+ * -+ * Since the GLX version advertised by the server is for the whole server, -+ * the GLX protocol code uses the minimum version supported on all screens. -+ */ -+ /*@{*/ -+ unsigned GLXmajor; -+ unsigned GLXminor; -+ /*@}*/ -+ - Bool (*CloseScreen)(int index, ScreenPtr pScreen); - Bool (*DestroyWindow)(WindowPtr pWindow); - }; -diff --git a/glx/glxserver.h b/glx/glxserver.h -index 4aa8c2e..80f1b28 100644 ---- a/glx/glxserver.h -+++ b/glx/glxserver.h -@@ -248,4 +248,7 @@ extern int __glXImageSize(GLenum format, GLenum type, - GLint imageHeight, GLint rowLength, GLint skipImages, GLint skipRows, - GLint alignment); - -+extern unsigned glxMajorVersion; -+extern unsigned glxMinorVersion; -+ - #endif /* !__GLX_server_h__ */ -diff --git a/glx/indirect_texture_compression.c b/glx/indirect_texture_compression.c -index 25c6eb3..5f44d7b 100644 ---- a/glx/indirect_texture_compression.c -+++ b/glx/indirect_texture_compression.c -@@ -52,7 +52,7 @@ int __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte *p - const GLenum target = *(GLenum *)(pc + 0); - const GLint level = *(GLint *)(pc + 4); - GLint compsize = 0; -- char *answer, answerBuffer[200]; -+ char *answer = NULL, answerBuffer[200]; - - CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize)); - -@@ -92,7 +92,7 @@ int __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyt - const GLenum target = (GLenum) bswap_32( *(int *)(pc + 0) ); - const GLint level = (GLint ) bswap_32( *(int *)(pc + 4) ); - GLint compsize = 0; -- char *answer, answerBuffer[200]; -+ char *answer = NULL, answerBuffer[200]; - - CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize)); - -diff --git a/include/protocol-versions.h b/include/protocol-versions.h -index da9770c..d688c66 100644 ---- a/include/protocol-versions.h -+++ b/include/protocol-versions.h -@@ -61,7 +61,7 @@ - - /* GLX */ - #define SERVER_GLX_MAJOR_VERSION 1 --#define SERVER_GLX_MINOR_VERSION 2 -+#define SERVER_GLX_MINOR_VERSION 4 - - /* Xinerama */ - #define SERVER_PANORAMIX_MAJOR_VERSION 1 --- -1.6.5.rc2 - diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.7.1-glx14-swrast.patch b/packages/x11/xserver/xorg-server/patches/xserver-1.7.1-glx14-swrast.patch deleted file mode 100644 index 2c51802535..0000000000 --- a/packages/x11/xserver/xorg-server/patches/xserver-1.7.1-glx14-swrast.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 25a0107768c9f25e8edc5e423ca8b1d0813f2d04 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 24 Nov 2009 13:38:46 -0500 -Subject: [PATCH] Enable GLX 1.4 for swrast - ---- - glx/glxdriswrast.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c -index 44f658f..20f9f90 100644 ---- a/glx/glxdriswrast.c -+++ b/glx/glxdriswrast.c -@@ -510,6 +510,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - - __glXScreenInit(&screen->base, pScreen); - -+ screen->base.GLXmajor = 1; -+ screen->base.GLXminor = 4; -+ - LogMessage(X_INFO, - "AIGLX: Loaded and initialized %s\n", filename); - --- -1.6.5.2 - diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.7.1-libcrypto.patch b/packages/x11/xserver/xorg-server/patches/xserver-1.7.1-libcrypto.patch deleted file mode 100644 index c271855a2c..0000000000 --- a/packages/x11/xserver/xorg-server/patches/xserver-1.7.1-libcrypto.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8875112f5c57ec5d575e717c5638fbc919145efb Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Mon, 16 Nov 2009 18:01:26 -0500 -Subject: [PATCH] configure: Only link against libcrypto - -openssl.pc will link you against libssl, which we don't need, and which -brings in another seven libraries we also don't need. This is still -bogus, we're really only trying to get a SHA1 routine, we could link it -statically and be even better off. ---- - configure.ac | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f69f97e..254d33d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1297,14 +1297,8 @@ if test "x$SHA1_LIB" = "x" ; then - fi - - if test "x$SHA1_LIB" = "x" ; then -- PKG_CHECK_EXISTS([OPENSSL], [openssl], [HAVE_OPENSSL_PKC=yes], -- [HAVE_OPENSSL_PKC=no]) -- if test "x$HAVE_OPENSSL_PKC" = xyes; then -- REQUIRED_LIBS="$REQUIRED_LIBS openssl" -- else - AC_CHECK_LIB([crypto], [SHA1_Init], [SHA1_LIB="-lcrypto"], - [AC_MSG_ERROR([OpenSSL must be installed in order to build the X server.])]) -- fi - fi - - PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS]) --- -1.6.5.2 - diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.8-udev-warning.diff b/packages/x11/xserver/xorg-server/patches/xserver-1.8-udev-warning.diff new file mode 100644 index 0000000000..666dd96658 --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/xserver-1.8-udev-warning.diff @@ -0,0 +1,37 @@ +From 57a188877b0472edb12bdf707b1550abbeb85af8 Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas +Date: Wed, 17 Feb 2010 11:12:36 +1000 +Subject: [PATCH] Stick giant warning into logfiles about udev configuration changes. + +Signed-off-by: Fedora X Ninjas +--- + hw/xfree86/common/xf86Config.c | 13 +++++++++++++ + 1 files changed, 13 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c +index 132e8bc..b1722cd 100644 +--- a/hw/xfree86/common/xf86Config.c ++++ b/hw/xfree86/common/xf86Config.c +@@ -1472,6 +1472,19 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) + "input devices.\n\tIf no devices become available, " + "reconfigure %s or disable AutoAddDevices.\n", + config_backend, config_backend); ++ ++ xf86Msg(X_INFO, "\n" ++ "***************************************************************\n" ++ "***************************************************************\n" ++ "** OpenELEC.tv switched to udev-based device detection with **\n" ++ "** xorg-x11-server-1.7.99.901-1. Custom HAL configuration **\n" ++ "** stored in /etc/hal/fdi/policy will not be seen by this **\n" ++ "** server version. If you have such configuration you will **\n" ++ "** need to update it to the new format. **\n" ++ "** For more information, see the Fedora wiki page **\n" ++ "** https://fedoraproject.org/wiki/Input_device_configuration **\n" ++ "***************************************************************\n" ++ "***************************************************************\n"); + #else + xf86Msg(X_INFO, "Hotplugging is disabled and no input devices were configured.\n" + "\tTry disabling AllowEmptyInput.\n"); +-- +1.6.6.1 + diff --git a/packages/x11/xserver/xorg-server/patches/xserver-boottime.patch b/packages/x11/xserver/xorg-server/patches/xserver-boottime.patch deleted file mode 100644 index efc85a42ab..0000000000 --- a/packages/x11/xserver/xorg-server/patches/xserver-boottime.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/os/log.c b/os/log.c -index 0860847..2c46f1a 100644 ---- a/os/log.c -+++ b/os/log.c -@@ -255,6 +255,33 @@ LogVWrite(int verb, const char *f, va_list args) - static char tmpBuffer[1024]; - int len = 0; - -+ struct timeval time; -+ time_t tv_sec; -+ suseconds_t tv_usec; -+ static Bool first = TRUE; -+ static time_t start_tv_sec; -+ static suseconds_t start_usec; -+ int diff_sec, diff_usec; -+ -+ gettimeofday(&time, NULL); -+ tv_sec = time.tv_sec; -+ tv_usec = time.tv_usec; -+ if (first == TRUE) { -+ start_tv_sec = tv_sec; -+ start_usec = tv_usec; -+ first = FALSE; -+ } -+ diff_sec = (int)difftime(tv_sec, start_tv_sec); -+ diff_usec = (tv_usec - start_usec); -+ if (diff_usec < 0) { -+ diff_sec--; -+ diff_usec += 1000000; -+ } -+ sprintf(tmpBuffer, "[%d sec: %06d usec]", diff_sec , diff_usec); -+ len = strlen(tmpBuffer); -+ if (logFile) -+ fwrite(tmpBuffer, len, 1, logFile); -+ - /* - * Since a va_list can only be processed once, write the string to a - * buffer, and then write the buffer out to the appropriate output diff --git a/packages/x11/xserver/xorg-server/patches/xserver-no-root-2.diff b/packages/x11/xserver/xorg-server/patches/xserver-no-root-2.diff new file mode 100644 index 0000000000..69af3f37c5 --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/xserver-no-root-2.diff @@ -0,0 +1,53 @@ +diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c +index 297e7a6..8671231 100644 +--- a/hw/xfree86/os-support/linux/lnx_init.c ++++ b/hw/xfree86/os-support/linux/lnx_init.c +@@ -42,6 +42,7 @@ static Bool KeepTty = FALSE; + static int VTnum = -1; + static Bool VTSwitch = TRUE; + static Bool ShareVTs = FALSE; ++Bool NoHwAccess = FALSE; + static int activeVT = -1; + + static int vtPermSave[4]; +@@ -377,6 +378,11 @@ xf86ProcessArgument(int argc, char *argv[], int i) + ShareVTs = TRUE; + return(1); + } ++ if (!strcmp(argv[i], "-nohwaccess")) ++ { ++ NoHwAccess = TRUE; ++ return(1); ++ } + if ((argv[i][0] == 'v') && (argv[i][1] == 't')) + { + if (sscanf(argv[i], "vt%2d", &VTnum) == 0) +@@ -397,5 +403,6 @@ xf86UseMsg(void) + ErrorF("-keeptty "); + ErrorF("don't detach controlling tty (for debugging only)\n"); + ErrorF("-novtswitch don't immediately switch to new VT\n"); ++ ErrorF("-nohwaccess don't access hardware ports directly\n"); + ErrorF("-sharevts share VTs with another X server\n"); + } +diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c +index 26a1742..c34bb85 100644 +--- a/hw/xfree86/os-support/linux/lnx_video.c ++++ b/hw/xfree86/os-support/linux/lnx_video.c +@@ -50,6 +50,7 @@ + #define MAP_FAILED ((void *)-1) + #endif + ++extern Bool NoHwAccess; + static Bool ExtendedEnabled = FALSE; + + #ifdef __ia64__ +@@ -496,6 +497,9 @@ xf86EnableIO(void) + int fd; + unsigned int ioBase_phys; + #endif ++ /* Fake it... */ ++ if (NoHwAccess) ++ return TRUE; + + if (ExtendedEnabled) + return TRUE; diff --git a/packages/x11/xserver/xorg-server/url b/packages/x11/xserver/xorg-server/url index 69d2bf394e..e2b23b6bdc 100644 --- a/packages/x11/xserver/xorg-server/url +++ b/packages/x11/xserver/xorg-server/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.5.tar.bz2 +http://sources.openelec.tv/svn/xorg-server-20100309.tar.bz2 From 4c868bbda1b2001508552855949ec6dac0caeb50 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 01:04:44 +0100 Subject: [PATCH 04/24] xf86-input-evdev: - add udev config file - remove hal configfile --- .../xf86-input-evdev/config/00-evdev.conf | 39 +++++++++++++++++++ .../xf86-input-evdev/config/10-x11-evdev.fdi | 18 --------- packages/x11/driver/xf86-input-evdev/install | 7 ++-- 3 files changed, 42 insertions(+), 22 deletions(-) create mode 100644 packages/x11/driver/xf86-input-evdev/config/00-evdev.conf delete mode 100644 packages/x11/driver/xf86-input-evdev/config/10-x11-evdev.fdi diff --git a/packages/x11/driver/xf86-input-evdev/config/00-evdev.conf b/packages/x11/driver/xf86-input-evdev/config/00-evdev.conf new file mode 100644 index 0000000000..877aa4ac5e --- /dev/null +++ b/packages/x11/driver/xf86-input-evdev/config/00-evdev.conf @@ -0,0 +1,39 @@ +# Catchall classes for input devices +# We don't simply match on any device since that also adds accelerometers +# and other devices that we don't really want to use. The list below +# matches everything but joysticks. + +Section "InputClass" + Identifier "evdev pointer catchall" + MatchIsPointer "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" +EndSection + +Section "InputClass" + Identifier "evdev keyboard catchall" + MatchIsKeyboard "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" +EndSection + +Section "InputClass" + Identifier "evdev touchpad catchall" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" +EndSection + +Section "InputClass" + Identifier "evdev tablet catchall" + MatchIsTablet "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" +EndSection + +Section "InputClass" + Identifier "evdev touchscreen catchall" + MatchIsTouchscreen "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" +EndSection diff --git a/packages/x11/driver/xf86-input-evdev/config/10-x11-evdev.fdi b/packages/x11/driver/xf86-input-evdev/config/10-x11-evdev.fdi deleted file mode 100644 index a7fe8ccb42..0000000000 --- a/packages/x11/driver/xf86-input-evdev/config/10-x11-evdev.fdi +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - evdev - - - - - - evdev - - - - diff --git a/packages/x11/driver/xf86-input-evdev/install b/packages/x11/driver/xf86-input-evdev/install index 6458108fee..f1717ff219 100755 --- a/packages/x11/driver/xf86-input-evdev/install +++ b/packages/x11/driver/xf86-input-evdev/install @@ -5,8 +5,7 @@ PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/$XORG_PATH_MODULES/input -cp $PKG_BUILD/src/.libs/evdev_drv.so $INSTALL/$XORG_PATH_MODULES/input + cp -PR $PKG_BUILD/src/.libs/evdev_drv.so $INSTALL/$XORG_PATH_MODULES/input -mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty -cp $PKG_DIR/config/10-x11-evdev.fdi \ - $INSTALL/usr/share/hal/fdi/policy/20thirdparty +mkdir -p $INSTALL/etc/X11/xorg.conf.d + cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d From cf53bfa7214ee661fa84e142b5556089fab07883 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 01:05:19 +0100 Subject: [PATCH 05/24] xf86-input-evdev: - add udev config file - dont install hal configfile --- .../config/98-input-synaptics.conf | 6 ++++++ packages/x11/driver/xf86-input-synaptics/install | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 packages/x11/driver/xf86-input-synaptics/config/98-input-synaptics.conf diff --git a/packages/x11/driver/xf86-input-synaptics/config/98-input-synaptics.conf b/packages/x11/driver/xf86-input-synaptics/config/98-input-synaptics.conf new file mode 100644 index 0000000000..9261175228 --- /dev/null +++ b/packages/x11/driver/xf86-input-synaptics/config/98-input-synaptics.conf @@ -0,0 +1,6 @@ +Section "InputClass" + Identifier "synaptics" + MatchIsTouchpad "true" + Driver "synaptics" +EndSection + diff --git a/packages/x11/driver/xf86-input-synaptics/install b/packages/x11/driver/xf86-input-synaptics/install index d70b51ef49..810b3cedae 100755 --- a/packages/x11/driver/xf86-input-synaptics/install +++ b/packages/x11/driver/xf86-input-synaptics/install @@ -4,8 +4,10 @@ $SCRIPTS/install libXi -mkdir -p $INSTALL/$XORG_PATH_MODULES/input - cp $PKG_BUILD/src/.libs/synaptics_drv.so $INSTALL/$XORG_PATH_MODULES/input +PKG_DIR=`find $PACKAGES -type d -name $1` -mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty/ - cp $PKG_BUILD/fdi/*.fdi $INSTALL/usr/share/hal/fdi/policy/20thirdparty/ +mkdir -p $INSTALL/$XORG_PATH_MODULES/input + cp -PR $PKG_BUILD/src/.libs/synaptics_drv.so $INSTALL/$XORG_PATH_MODULES/input + +mkdir -p $INSTALL/etc/X11/xorg.conf.d + cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d From 260b237e2feced694b1530dbd2228f48def08016 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 01:06:28 +0100 Subject: [PATCH 06/24] xf86-input-wacom: - add udev config file - dont install hal configfile --- .../xf86-input-wacom/config/10-wacom.conf | 20 +++++++++++++++++++ .../config/69-xorg-wacom.rules | 2 ++ packages/x11/driver/xf86-input-wacom/install | 9 +++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 packages/x11/driver/xf86-input-wacom/config/10-wacom.conf create mode 100644 packages/x11/driver/xf86-input-wacom/config/69-xorg-wacom.rules diff --git a/packages/x11/driver/xf86-input-wacom/config/10-wacom.conf b/packages/x11/driver/xf86-input-wacom/config/10-wacom.conf new file mode 100644 index 0000000000..dd486eef48 --- /dev/null +++ b/packages/x11/driver/xf86-input-wacom/config/10-wacom.conf @@ -0,0 +1,20 @@ +Section "InputClass" + Identifier "Wacom class" + MatchProduct "Wacom|WALTOP|WACOM" + Driver "wacom" +EndSection + +Section "InputClass" + Identifier "Wacom serial class" + MatchProduct "WACf|FUJ02e5|FUJ02e7" + Driver "wacom" + Option "ForceDevice" "ISDV4" +EndSection + +# N-Trig Duosense Electromagnetic Digitizer +Section "InputClass" + Identifier "Wacom N-Trig class" + MatchProduct "HID 1b96:0001" + MatchDevicePath "/dev/input/event*" + Driver "wacom" +EndSection diff --git a/packages/x11/driver/xf86-input-wacom/config/69-xorg-wacom.rules b/packages/x11/driver/xf86-input-wacom/config/69-xorg-wacom.rules new file mode 100644 index 0000000000..b7da7c1b1f --- /dev/null +++ b/packages/x11/driver/xf86-input-wacom/config/69-xorg-wacom.rules @@ -0,0 +1,2 @@ +ACTION=="add|change", SUBSYSTEM=="pnp", ATTR{id}=="WACf*", ENV{NAME}="Serial Wacom Tablet" +ACTION=="add|change", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{x11_driver}="wacom", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1" diff --git a/packages/x11/driver/xf86-input-wacom/install b/packages/x11/driver/xf86-input-wacom/install index 38599edb63..47555323cb 100755 --- a/packages/x11/driver/xf86-input-wacom/install +++ b/packages/x11/driver/xf86-input-wacom/install @@ -2,11 +2,16 @@ . config/options +PKG_DIR=`find $PACKAGES -type d -name $1` + mkdir -p $INSTALL/$XORG_PATH_MODULES/input cp -PR $PKG_BUILD/src/.libs/wacom_drv.so $INSTALL/$XORG_PATH_MODULES/input -mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty/ - cp -PR $PKG_BUILD/fdi/*.fdi $INSTALL/usr/share/hal/fdi/policy/20thirdparty/ +mkdir -p $INSTALL/etc/X11/xorg.conf.d + cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d + +mkdir -p $INSTALL/lib/udev/rules.d + cp -PR $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d mkdir -p $INSTALL/usr/bin cp -PR $PKG_BUILD/tools/xsetwacom $INSTALL/usr/bin From da67828baf68ca46ef8f9f29cfadc23c40429c0d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 01:07:20 +0100 Subject: [PATCH 07/24] xf86-video-intel: - update to xf86-video-intel-20100309 --- packages/x11/driver/xf86-video-intel/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-intel/url b/packages/x11/driver/xf86-video-intel/url index 4d395a3ed3..f024338be9 100644 --- a/packages/x11/driver/xf86-video-intel/url +++ b/packages/x11/driver/xf86-video-intel/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-2.10.901.tar.bz2 \ No newline at end of file +http://sources.openelec.tv/svn/xf86-video-intel-20100309.tar.bz2 \ No newline at end of file From 78d129b6e1708274212c6adb7e40d777d8192b6a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 01:07:36 +0100 Subject: [PATCH 08/24] libX11: - update to libX11-20100213 --- packages/x11/lib/libX11/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/lib/libX11/url b/packages/x11/lib/libX11/url index bcd0ba4868..7fed5aa5d3 100644 --- a/packages/x11/lib/libX11/url +++ b/packages/x11/lib/libX11/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/lib/libX11-1.3.3.tar.bz2 \ No newline at end of file +http://sources.openelec.tv/svn/libX11-20100213.tar.bz2 From bc5e2dc1d6b2aa784ad3017da2379f0c8d872332 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 01:07:51 +0100 Subject: [PATCH 09/24] glproto: - update to glproto-20100225 --- packages/x11/proto/glproto/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/proto/glproto/url b/packages/x11/proto/glproto/url index 32c967c794..8fe0ff4090 100644 --- a/packages/x11/proto/glproto/url +++ b/packages/x11/proto/glproto/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/proto/glproto-1.4.11.tar.bz2 \ No newline at end of file +http://sources.openelec.tv/svn/glproto-20100225.tar.bz2 From da73337e4770447d9b8527ed8c948a6e057d29c1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 13:44:14 +0100 Subject: [PATCH 10/24] glib: - update to glib-2.23.5 --- .../glib-2.23.5-fix_compiling-0.3.diff | 70 +++++++++++++++++++ .../devel/glib/patches/glib-i386-atomic.diff | 15 ---- packages/devel/glib/url | 2 +- 3 files changed, 71 insertions(+), 16 deletions(-) create mode 100644 packages/devel/glib/patches/glib-2.23.5-fix_compiling-0.3.diff delete mode 100644 packages/devel/glib/patches/glib-i386-atomic.diff diff --git a/packages/devel/glib/patches/glib-2.23.5-fix_compiling-0.3.diff b/packages/devel/glib/patches/glib-2.23.5-fix_compiling-0.3.diff new file mode 100644 index 0000000000..8e81ba0f28 --- /dev/null +++ b/packages/devel/glib/patches/glib-2.23.5-fix_compiling-0.3.diff @@ -0,0 +1,70 @@ +diff -Naur glib-2.23.5/gio/Makefile.am glib-2.23.5.patch/gio/Makefile.am +--- glib-2.23.5/gio/Makefile.am 2010-03-06 17:51:40.000000000 +0100 ++++ glib-2.23.5.patch/gio/Makefile.am 2010-03-09 09:38:50.205664589 +0100 +@@ -466,6 +466,7 @@ + $(top_builddir)/glib/libglib-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ + $(top_builddir)/gmodule/libgmodule-2.0.la \ ++ $(top_builddir)/gthread/libgthread-2.0.la \ + libgio-2.0.la \ + $(NULL) + +diff -Naur glib-2.23.5/gio/Makefile.in glib-2.23.5.patch/gio/Makefile.in +--- glib-2.23.5/gio/Makefile.in 2010-03-08 16:35:06.000000000 +0100 ++++ glib-2.23.5.patch/gio/Makefile.in 2010-03-09 09:39:16.717664516 +0100 +@@ -824,6 +824,7 @@ + $(top_builddir)/glib/libglib-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ + $(top_builddir)/gmodule/libgmodule-2.0.la \ ++ $(top_builddir)/gthread/libgthread-2.0.la \ + libgio-2.0.la \ + $(NULL) + +diff -Naur glib-2.23.5/gio/tests/Makefile.am glib-2.23.5.patch/gio/tests/Makefile.am +--- glib-2.23.5/gio/tests/Makefile.am 2010-03-06 17:51:40.000000000 +0100 ++++ glib-2.23.5.patch/gio/tests/Makefile.am 2010-03-09 09:39:44.816664472 +0100 +@@ -14,6 +14,8 @@ + progs_ldadd = \ + $(top_builddir)/glib/libglib-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ ++ $(top_builddir)/gmodule/libgmodule-2.0.la \ ++ $(top_builddir)/gthread/libgthread-2.0.la \ + $(top_builddir)/gio/libgio-2.0.la + + +diff -Naur glib-2.23.5/gio/tests/Makefile.in glib-2.23.5.patch/gio/tests/Makefile.in +--- glib-2.23.5/gio/tests/Makefile.in 2010-03-08 16:35:07.000000000 +0100 ++++ glib-2.23.5.patch/gio/tests/Makefile.in 2010-03-09 09:40:11.250664543 +0100 +@@ -448,6 +448,8 @@ + progs_ldadd = \ + $(top_builddir)/glib/libglib-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ ++ $(top_builddir)/gmodule/libgmodule-2.0.la \ ++ $(top_builddir)/gthread/libgthread-2.0.la \ + $(top_builddir)/gio/libgio-2.0.la + + SAMPLE_PROGS = \ +diff -Naur glib-2.23.5/tests/Makefile.am glib-2.23.5.patch/tests/Makefile.am +--- glib-2.23.5/tests/Makefile.am 2010-01-22 03:57:55.000000000 +0100 ++++ glib-2.23.5.patch/tests/Makefile.am 2010-03-09 09:36:39.805664621 +0100 +@@ -86,7 +86,7 @@ + assert_msg_test_LDADD = $(libglib) + if ENABLE_TIMELOOP + timeloop_LDADD = $(libglib) +-timeloop_closure_LDADD = $(libglib) $(libgobject) ++timeloop_closure_LDADD = $(libglib) $(libgobject) $(libgthread) + endif + + test_programs = \ +diff -Naur glib-2.23.5/tests/Makefile.in glib-2.23.5.patch/tests/Makefile.in +--- glib-2.23.5/tests/Makefile.in 2010-03-08 16:35:08.000000000 +0100 ++++ glib-2.23.5.patch/tests/Makefile.in 2010-03-09 09:37:22.598664379 +0100 +@@ -692,7 +692,7 @@ + errorcheck_mutex_test_LDADD = $(libglib) $(libgthread) $(G_THREAD_LIBS) + assert_msg_test_LDADD = $(libglib) + @ENABLE_TIMELOOP_TRUE@timeloop_LDADD = $(libglib) +-@ENABLE_TIMELOOP_TRUE@timeloop_closure_LDADD = $(libglib) $(libgobject) ++@ENABLE_TIMELOOP_TRUE@timeloop_closure_LDADD = $(libglib) $(libgobject) $(libgthread) + test_programs = \ + atomic-test \ + base64-test \ diff --git a/packages/devel/glib/patches/glib-i386-atomic.diff b/packages/devel/glib/patches/glib-i386-atomic.diff deleted file mode 100644 index 01495c0070..0000000000 --- a/packages/devel/glib/patches/glib-i386-atomic.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff -up glib-2.16.6/configure.atomic glib-2.16.6/configure ---- glib-2.16.6/configure.atomic 2008-10-27 18:24:20.000000000 -0400 -+++ glib-2.16.6/configure 2008-10-27 18:24:31.000000000 -0400 -@@ -42742,11 +42742,6 @@ $as_echo_n "checking whether to use asse - - if test x"$GCC" = xyes; then - case $host_cpu in -- i386) -- { $as_echo "$as_me:$LINENO: result: none" >&5 --$as_echo "none" >&6; } -- glib_memory_barrier_needed=no -- ;; - i?86) - { $as_echo "$as_me:$LINENO: result: i486" >&5 - $as_echo "i486" >&6; } diff --git a/packages/devel/glib/url b/packages/devel/glib/url index 1313421652..9c5b1fe999 100644 --- a/packages/devel/glib/url +++ b/packages/devel/glib/url @@ -1 +1 @@ -http://ftp.gnome.org/pub/GNOME/sources/glib/2.23/glib-2.23.1.tar.bz2 +http://ftp.gnome.org/pub/GNOME/sources/glib/2.23/glib-2.23.5.tar.bz2 From f59cf9f82487e047aab327d40a316fad8e4e6d9b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 13:44:35 +0100 Subject: [PATCH 11/24] Mesa: - update to Mesa-7.8-20100318 --- packages/graphics/Mesa/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/Mesa/url b/packages/graphics/Mesa/url index 2e883a99b3..4d940a8ccc 100644 --- a/packages/graphics/Mesa/url +++ b/packages/graphics/Mesa/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/Mesa-7.8-20100309.tar.bz2 +http://sources.openelec.tv/svn/Mesa-7.8-20100318.tar.bz2 From 8c6427538d517e63c28763b91f52ceabf865acce Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 13:44:59 +0100 Subject: [PATCH 12/24] libdrm: - update to libdrm-20100318 --- packages/graphics/libdrm/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/libdrm/url b/packages/graphics/libdrm/url index 8121b29364..de37fe91ea 100644 --- a/packages/graphics/libdrm/url +++ b/packages/graphics/libdrm/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/libdrm-20100309.tar.bz2 +http://sources.openelec.tv/svn/libdrm-20100318.tar.bz2 From a36711d82446274f28ccbd52fcc6c18fd0e3ac8a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 13:45:22 +0100 Subject: [PATCH 13/24] xbmc: - add patch to build with newer glib --- .../patches/xbmc-undef_byte_for_glib-2.23.x-0.1.diff | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-undef_byte_for_glib-2.23.x-0.1.diff diff --git a/packages/mediacenter/xbmc/patches/xbmc-undef_byte_for_glib-2.23.x-0.1.diff b/packages/mediacenter/xbmc/patches/xbmc-undef_byte_for_glib-2.23.x-0.1.diff new file mode 100644 index 0000000000..0b72e14a70 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-undef_byte_for_glib-2.23.x-0.1.diff @@ -0,0 +1,11 @@ +diff -Naur xbmc-28622/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMMS.cpp xbmc-28622.patch/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMMS.cpp +--- xbmc-28622/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMMS.cpp 2010-03-17 20:11:42.000000000 +0100 ++++ xbmc-28622.patch/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMMS.cpp 2010-03-19 04:04:41.074751644 +0100 +@@ -35,6 +35,7 @@ + // some distros have already patched this but upstream @ https://launchpad.net/libmms + // does still has the "this" usage. + #define this instance ++#undef byte + #include // FIXME: remove this header once the ubuntu headers is fixed (variable named this) + #include + #include From 86ee2474b6db8aa146615ec4e872ede55014b333 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 13:45:41 +0100 Subject: [PATCH 14/24] xf86-video-intel: - update to xf86-video-intel-20100318 --- packages/x11/driver/xf86-video-intel/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-intel/url b/packages/x11/driver/xf86-video-intel/url index 71230b399a..277ac5e6a5 100644 --- a/packages/x11/driver/xf86-video-intel/url +++ b/packages/x11/driver/xf86-video-intel/url @@ -1 +1 @@ -http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-2.10.902.tar.bz2 +http://sources.openelec.tv/svn/xf86-video-intel-20100318.tar.bz2 From b6e242990f4f687534b17c9434f9d868466cc74f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 13:46:39 +0100 Subject: [PATCH 15/24] xorg-server: - remove old and update patches --- .../patches/03_fedora_glx_versioning.diff | 233 ------------------ .../patches/04_fedora_glx14-swrast.diff | 26 -- .../05_only_call_gamma_set_if_nonnull.diff | 25 -- ...ont_trap_access_to_timer_and_keyboard.diff | 22 -- ...t-after-CreateWellKnownSockets-and-In.diff | 34 --- ...16-xfree86-fix-build-with-xv-disabled.diff | 53 ---- ....diff => 20_extra_modelines_fromxorg.diff} | 0 .../patches/xserver-1.5.0-bg-none-root.diff | 30 +-- .../xorg-server/patches/xserver-boottime.diff | 38 --- 9 files changed, 15 insertions(+), 446 deletions(-) delete mode 100644 packages/x11/xserver/xorg-server/patches/03_fedora_glx_versioning.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/04_fedora_glx14-swrast.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/05_only_call_gamma_set_if_nonnull.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/06_dont_trap_access_to_timer_and_keyboard.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff delete mode 100644 packages/x11/xserver/xorg-server/patches/16-xfree86-fix-build-with-xv-disabled.diff rename packages/x11/xserver/xorg-server/patches/{001_fedora_extramodes.diff => 20_extra_modelines_fromxorg.diff} (100%) delete mode 100644 packages/x11/xserver/xorg-server/patches/xserver-boottime.diff diff --git a/packages/x11/xserver/xorg-server/patches/03_fedora_glx_versioning.diff b/packages/x11/xserver/xorg-server/patches/03_fedora_glx_versioning.diff deleted file mode 100644 index c8a1c30954..0000000000 --- a/packages/x11/xserver/xorg-server/patches/03_fedora_glx_versioning.diff +++ /dev/null @@ -1,233 +0,0 @@ -From 3ef4be8129f78afd5566a9e5d0fb901449dcb771 Mon Sep 17 00:00:00 2001 -From: Ian Romanick -Date: Tue, 29 Sep 2009 16:43:43 -0700 -Subject: [PATCH] GLX: Enable GLX 1.4 on DRI2 - -this squashes 4 commits -(cherry picked from commit ad5c0d9efa47476ed5cf75c82265c73919e468b4) -(cherry picked from commit cb54cf1b3e8c4109541cfb698542c00f2473e731) -(cherry picked from commit 4c6bfa2c09ae2b0cffdf9211a6dfbcaefe0366b5) -(cherry picked from commit 9bf2ff4faf730913de3073f346646a8727be41d4) ---- - glx/glxcmds.c | 12 ++++++++---- - glx/glxdri2.c | 12 ++++++++++++ - glx/glxext.c | 8 +++++++- - glx/glxscreens.c | 15 ++++++++++++--- - glx/glxscreens.h | 11 +++++++++++ - glx/glxserver.h | 3 +++ - glx/indirect_texture_compression.c | 4 ++-- - include/protocol-versions.h | 2 +- - 8 files changed, 56 insertions(+), 11 deletions(-) - -diff --git a/glx/glxcmds.c b/glx/glxcmds.c -index b1061a8..ba4c123 100644 ---- a/glx/glxcmds.c -+++ b/glx/glxcmds.c -@@ -50,7 +50,6 @@ - #include "indirect_dispatch.h" - #include "indirect_table.h" - #include "indirect_util.h" --#include "protocol-versions.h" - - static int - validGlxScreen(ClientPtr client, int screen, __GLXscreen **pGlxScreen, int *err) -@@ -739,8 +738,8 @@ int __glXDisp_QueryVersion(__GLXclientState *cl, GLbyte *pc) - ** client if it wants to work with older clients; however, in this - ** implementation the server just returns its version number. - */ -- reply.majorVersion = SERVER_GLX_MAJOR_VERSION; -- reply.minorVersion = SERVER_GLX_MINOR_VERSION; -+ reply.majorVersion = glxMajorVersion; -+ reply.minorVersion = glxMinorVersion; - reply.length = 0; - reply.type = X_Reply; - reply.sequenceNumber = client->sequence; -@@ -2360,6 +2359,7 @@ int __glXDisp_QueryServerString(__GLXclientState *cl, GLbyte *pc) - char *buf; - __GLXscreen *pGlxScreen; - int err; -+ char ver_str[16]; - - if (!validGlxScreen(client, req->screen, &pGlxScreen, &err)) - return err; -@@ -2369,7 +2369,11 @@ int __glXDisp_QueryServerString(__GLXclientState *cl, GLbyte *pc) - ptr = pGlxScreen->GLXvendor; - break; - case GLX_VERSION: -- ptr = pGlxScreen->GLXversion; -+ /* Return to the server version rather than the screen version -+ * to prevent confusion when they do not match. -+ */ -+ snprintf(ver_str, 16, "%d.%d", glxMajorVersion, glxMinorVersion); -+ ptr = ver_str; - break; - case GLX_EXTENSIONS: - ptr = pGlxScreen->GLXextensions; -diff --git a/glx/glxdri2.c b/glx/glxdri2.c -index ed7fb4c..ed7dc80 100644 ---- a/glx/glxdri2.c -+++ b/glx/glxdri2.c -@@ -685,6 +685,18 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - screen->base.GLXextensions); - } - -+ /* We're going to assume (perhaps incorrectly?) that all DRI2-enabled -+ * drivers support the required extensions for GLX 1.4. The extensions -+ * we're assuming are: -+ * -+ * - GLX_SGI_make_current_read (1.3) -+ * - GLX_SGIX_fbconfig (1.3) -+ * - GLX_SGIX_pbuffer (1.3) -+ * - GLX_ARB_multisample (1.4) -+ */ -+ screen->base.GLXmajor = 1; -+ screen->base.GLXminor = 4; -+ - screen->enterVT = pScrn->EnterVT; - pScrn->EnterVT = glxDRIEnterVT; - screen->leaveVT = pScrn->LeaveVT; -diff --git a/glx/glxext.c b/glx/glxext.c -index 19d70d4..9f9c0ed 100644 ---- a/glx/glxext.c -+++ b/glx/glxext.c -@@ -360,12 +360,18 @@ void GlxExtensionInit(void) - pScreen = screenInfo.screens[i]; - - for (p = __glXProviderStack; p != NULL; p = p->next) { -- if (p->screenProbe(pScreen) != NULL) { -+ __GLXscreen *glxScreen; -+ -+ glxScreen = p->screenProbe(pScreen); -+ if (glxScreen != NULL) { -+ if (glxScreen->GLXminor < glxMinorVersion) -+ glxMinorVersion = glxScreen->GLXminor; - LogMessage(X_INFO, - "GLX: Initialized %s GL provider for screen %d\n", - p->name, i); - break; - } -+ - } - - if (!p) -diff --git a/glx/glxscreens.c b/glx/glxscreens.c -index 7d29d31..674e2c6 100644 ---- a/glx/glxscreens.c -+++ b/glx/glxscreens.c -@@ -42,6 +42,7 @@ - #include "glxserver.h" - #include "glxutil.h" - #include "glxext.h" -+#include "protocol-versions.h" - - static int glxScreenPrivateKeyIndex; - static DevPrivateKey glxScreenPrivateKey = &glxScreenPrivateKeyIndex; -@@ -162,7 +163,8 @@ static const char GLServerExtensions[] = - ** supported across all screens in a multi-screen system. - */ - static char GLXServerVendorName[] = "SGI"; --static char GLXServerVersion[] = "1.2"; -+unsigned glxMajorVersion = SERVER_GLX_MAJOR_VERSION; -+unsigned glxMinorVersion = SERVER_GLX_MINOR_VERSION; - static char GLXServerExtensions[] = - "GLX_ARB_multisample " - "GLX_EXT_visual_info " -@@ -378,9 +380,17 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen) - pGlxScreen->pScreen = pScreen; - pGlxScreen->GLextensions = xstrdup(GLServerExtensions); - pGlxScreen->GLXvendor = xstrdup(GLXServerVendorName); -- pGlxScreen->GLXversion = xstrdup(GLXServerVersion); - pGlxScreen->GLXextensions = xstrdup(GLXServerExtensions); - -+ /* All GLX providers must support all of the functionality required for at -+ * least GLX 1.2. If the provider supports a higher version, the GLXminor -+ * version can be changed in the provider's screen-probe routine. For -+ * most providers, the screen-probe routine is the caller of this -+ * function. -+ */ -+ pGlxScreen->GLXmajor = 1; -+ pGlxScreen->GLXminor = 2; -+ - pGlxScreen->CloseScreen = pScreen->CloseScreen; - pScreen->CloseScreen = glxCloseScreen; - pGlxScreen->DestroyWindow = pScreen->DestroyWindow; -@@ -454,7 +464,6 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen) - void __glXScreenDestroy(__GLXscreen *screen) - { - xfree(screen->GLXvendor); -- xfree(screen->GLXversion); - xfree(screen->GLXextensions); - xfree(screen->GLextensions); - } -diff --git a/glx/glxscreens.h b/glx/glxscreens.h -index 3c1bdd4..bff4363 100644 ---- a/glx/glxscreens.h -+++ b/glx/glxscreens.h -@@ -161,6 +161,17 @@ struct __GLXscreen { - char *GLXversion; - char *GLXextensions; - -+ /** -+ * \name GLX version supported by this screen. -+ * -+ * Since the GLX version advertised by the server is for the whole server, -+ * the GLX protocol code uses the minimum version supported on all screens. -+ */ -+ /*@{*/ -+ unsigned GLXmajor; -+ unsigned GLXminor; -+ /*@}*/ -+ - Bool (*CloseScreen)(int index, ScreenPtr pScreen); - Bool (*DestroyWindow)(WindowPtr pWindow); - }; -diff --git a/glx/glxserver.h b/glx/glxserver.h -index 4aa8c2e..80f1b28 100644 ---- a/glx/glxserver.h -+++ b/glx/glxserver.h -@@ -248,4 +248,7 @@ extern int __glXImageSize(GLenum format, GLenum type, - GLint imageHeight, GLint rowLength, GLint skipImages, GLint skipRows, - GLint alignment); - -+extern unsigned glxMajorVersion; -+extern unsigned glxMinorVersion; -+ - #endif /* !__GLX_server_h__ */ -diff --git a/glx/indirect_texture_compression.c b/glx/indirect_texture_compression.c -index 25c6eb3..5f44d7b 100644 ---- a/glx/indirect_texture_compression.c -+++ b/glx/indirect_texture_compression.c -@@ -52,7 +52,7 @@ int __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte *p - const GLenum target = *(GLenum *)(pc + 0); - const GLint level = *(GLint *)(pc + 4); - GLint compsize = 0; -- char *answer, answerBuffer[200]; -+ char *answer = NULL, answerBuffer[200]; - - CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize)); - -@@ -92,7 +92,7 @@ int __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyt - const GLenum target = (GLenum) bswap_32( *(int *)(pc + 0) ); - const GLint level = (GLint ) bswap_32( *(int *)(pc + 4) ); - GLint compsize = 0; -- char *answer, answerBuffer[200]; -+ char *answer = NULL, answerBuffer[200]; - - CALL_GetTexLevelParameteriv(GET_DISPATCH(), (target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &compsize)); - -diff --git a/include/protocol-versions.h b/include/protocol-versions.h -index da9770c..d688c66 100644 ---- a/include/protocol-versions.h -+++ b/include/protocol-versions.h -@@ -61,7 +61,7 @@ - - /* GLX */ - #define SERVER_GLX_MAJOR_VERSION 1 --#define SERVER_GLX_MINOR_VERSION 2 -+#define SERVER_GLX_MINOR_VERSION 4 - - /* Xinerama */ - #define SERVER_PANORAMIX_MAJOR_VERSION 1 --- -1.6.5.rc2 - diff --git a/packages/x11/xserver/xorg-server/patches/04_fedora_glx14-swrast.diff b/packages/x11/xserver/xorg-server/patches/04_fedora_glx14-swrast.diff deleted file mode 100644 index 2c51802535..0000000000 --- a/packages/x11/xserver/xorg-server/patches/04_fedora_glx14-swrast.diff +++ /dev/null @@ -1,26 +0,0 @@ -From 25a0107768c9f25e8edc5e423ca8b1d0813f2d04 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 24 Nov 2009 13:38:46 -0500 -Subject: [PATCH] Enable GLX 1.4 for swrast - ---- - glx/glxdriswrast.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c -index 44f658f..20f9f90 100644 ---- a/glx/glxdriswrast.c -+++ b/glx/glxdriswrast.c -@@ -510,6 +510,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - - __glXScreenInit(&screen->base, pScreen); - -+ screen->base.GLXmajor = 1; -+ screen->base.GLXminor = 4; -+ - LogMessage(X_INFO, - "AIGLX: Loaded and initialized %s\n", filename); - --- -1.6.5.2 - diff --git a/packages/x11/xserver/xorg-server/patches/05_only_call_gamma_set_if_nonnull.diff b/packages/x11/xserver/xorg-server/patches/05_only_call_gamma_set_if_nonnull.diff deleted file mode 100644 index b1d00ba6d0..0000000000 --- a/packages/x11/xserver/xorg-server/patches/05_only_call_gamma_set_if_nonnull.diff +++ /dev/null @@ -1,25 +0,0 @@ -Bug#564203 - -From 8ca4233017e9f441303088e7054b6a7c4f171d80 Mon Sep 17 00:00:00 2001 -From: Michael Vogt -Date: Wed, 6 Jan 2010 14:40:34 +0100 -Subject: [PATCH] * hw/xfree86/modes/xf86Crtc.c: - - only call gamma_set if its non NULL - ---- - hw/xfree86/modes/xf86Crtc.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index d015c6a..573fe96 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -354,7 +354,7 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati - } - - /* Only upload when needed, to avoid unneeded delays. */ -- if (!crtc->active) -+ if (!crtc->active && crtc->funcs->gamma_set) - crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green, - crtc->gamma_blue, crtc->gamma_size); - diff --git a/packages/x11/xserver/xorg-server/patches/06_dont_trap_access_to_timer_and_keyboard.diff b/packages/x11/xserver/xorg-server/patches/06_dont_trap_access_to_timer_and_keyboard.diff deleted file mode 100644 index 23d8dc79ad..0000000000 --- a/packages/x11/xserver/xorg-server/patches/06_dont_trap_access_to_timer_and_keyboard.diff +++ /dev/null @@ -1,22 +0,0 @@ -[PATCH] Do not trap access to timer and keyboard - -Some VESA BIOSes need to access to them. - -Signed-off-by: Samuel Thibault ---- - hw/xfree86/os-support/hurd/hurd_video.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c -index 4a99db3..e049ceb 100644 ---- a/hw/xfree86/os-support/hurd/hurd_video.c -+++ b/hw/xfree86/os-support/hurd/hurd_video.c -@@ -124,8 +124,6 @@ xf86EnableIO() - FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno)); - return FALSE; - } -- ioperm(0x40,4,0); /* trap access to the timer chip */ -- ioperm(0x60,4,0); /* trap access to the keyboard controller */ - return TRUE; - } - diff --git a/packages/x11/xserver/xorg-server/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff b/packages/x11/xserver/xorg-server/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff deleted file mode 100644 index 38d8d8dfdf..0000000000 --- a/packages/x11/xserver/xorg-server/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff +++ /dev/null @@ -1,34 +0,0 @@ -From 4ae407a5a308febf63de27a62f8c301c73b37d3e Mon Sep 17 00:00:00 2001 -From: Julien Cristau -Date: Tue, 6 Oct 2009 17:44:33 +0200 -Subject: [PATCH 1/5] Move config_init() after CreateWellKnownSockets() and InitCoreDevices() - -config_init() can now add devices directly instead of scheduling a -timer. - -Signed-off-by: Julien Cristau -Tested-by: Peter Hutterer ---- - dix/main.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -Index: xorg-server/dix/main.c -=================================================================== ---- xorg-server.orig/dix/main.c -+++ xorg-server/dix/main.c -@@ -168,7 +168,6 @@ - InitBlockAndWakeupHandlers(); - /* Perform any operating system dependent initializations you'd like */ - OsInit(); -- config_init(); - if(serverGeneration == 1) - { - CreateWellKnownSockets(); -@@ -256,6 +255,7 @@ - InitCoreDevices(); - InitInput(argc, argv); - InitAndStartDevices(); -+ config_init(); - - dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset); - diff --git a/packages/x11/xserver/xorg-server/patches/16-xfree86-fix-build-with-xv-disabled.diff b/packages/x11/xserver/xorg-server/patches/16-xfree86-fix-build-with-xv-disabled.diff deleted file mode 100644 index 184301f913..0000000000 --- a/packages/x11/xserver/xorg-server/patches/16-xfree86-fix-build-with-xv-disabled.diff +++ /dev/null @@ -1,53 +0,0 @@ -From fe7575e929d65e8c798104ec2f72b879051694d3 Mon Sep 17 00:00:00 2001 -From: Julien Cristau -Date: Mon, 8 Feb 2010 02:04:33 +0100 -Subject: [PATCH] xfree86: fix build with xv disabled - ---- - hw/xfree86/modes/xf86Crtc.c | 2 ++ - hw/xfree86/modes/xf86Crtc.h | 2 ++ - 2 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 30b49af..62f8737 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -3009,6 +3009,7 @@ xf86_crtc_box_area(BoxPtr box) - return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1); - } - -+#ifdef XV - /* - * Return the crtc covering 'box'. If two crtcs cover a portion of - * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc -@@ -3097,6 +3098,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn, - - return ret; - } -+#endif - - xf86_crtc_notify_proc_ptr - xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new) -diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h -index 9baa956..2fb32c1 100644 ---- a/hw/xfree86/modes/xf86Crtc.h -+++ b/hw/xfree86/modes/xf86Crtc.h -@@ -908,6 +908,7 @@ xf86_hide_cursors (ScrnInfoPtr scrn); - extern _X_EXPORT void - xf86_cursors_fini (ScreenPtr screen); - -+#ifdef XV - /* - * For overlay video, compute the relevant CRTC and - * clip video to that. -@@ -926,6 +927,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn, - RegionPtr reg, - INT32 width, - INT32 height); -+#endif - - extern _X_EXPORT xf86_crtc_notify_proc_ptr - xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new); --- -1.6.6.1 - diff --git a/packages/x11/xserver/xorg-server/patches/001_fedora_extramodes.diff b/packages/x11/xserver/xorg-server/patches/20_extra_modelines_fromxorg.diff similarity index 100% rename from packages/x11/xserver/xorg-server/patches/001_fedora_extramodes.diff rename to packages/x11/xserver/xorg-server/patches/20_extra_modelines_fromxorg.diff diff --git a/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.diff b/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.diff index 097b085a32..ae65d0be4c 100644 --- a/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.diff +++ b/packages/x11/xserver/xorg-server/patches/xserver-1.5.0-bg-none-root.diff @@ -1,6 +1,6 @@ -From b4e4b980663692a3af5787eeaf2d48eb6c0188ed Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas -Date: Tue, 4 Aug 2009 14:45:58 +1000 +From eff3bb9c6f0b71a57705885a3fe6e6469d252d2b Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas +Date: Wed, 20 Jan 2010 14:46:12 +1300 Subject: [PATCH] Add nr for background=none root --- @@ -25,7 +25,7 @@ index c24a94f..907a5e8 100644 int cursorScreenDevPriv[MAXSCREENS]; diff --git a/dix/window.c b/dix/window.c -index 32e26d9..0bf1d52 100644 +index caff1cb..be1d1c4 100644 --- a/dix/window.c +++ b/dix/window.c @@ -466,22 +466,24 @@ InitRootWindow(WindowPtr pWin) @@ -59,7 +59,7 @@ index 32e26d9..0bf1d52 100644 MapWindow(pWin, serverClient); } diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c -index e84da4e..2a0f47a 100644 +index 6707448..776b898 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -77,6 +77,7 @@ @@ -70,7 +70,7 @@ index e84da4e..2a0f47a 100644 #include "xf86VGAarbiter.h" #include "globals.h" -@@ -234,6 +235,7 @@ xf86CreateRootWindow(WindowPtr pWin) +@@ -254,6 +255,7 @@ xf86CreateRootWindow(WindowPtr pWin) int ret = TRUE; int err = Success; ScreenPtr pScreen = pWin->drawable.pScreen; @@ -78,7 +78,7 @@ index e84da4e..2a0f47a 100644 RootWinPropPtr pProp; CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr) dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey); -@@ -285,6 +287,15 @@ xf86CreateRootWindow(WindowPtr pWin) +@@ -305,6 +307,15 @@ xf86CreateRootWindow(WindowPtr pWin) } } @@ -95,10 +95,10 @@ index e84da4e..2a0f47a 100644 return (ret); } diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h -index 5c3ee44..e3c7841 100644 +index de1f1b6..5c3aa00 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h -@@ -516,7 +516,7 @@ typedef struct _confdrirec { +@@ -503,7 +503,7 @@ typedef struct _confdrirec { } confDRIRec, *confDRIPtr; /* These values should be adjusted when new fields are added to ScrnInfoRec */ @@ -107,8 +107,8 @@ index 5c3ee44..e3c7841 100644 #define NUM_RESERVED_POINTERS 14 #define NUM_RESERVED_FUNCS 11 -@@ -800,6 +800,9 @@ typedef struct _ScrnInfoRec { - ClockRangesPtr clockRanges; +@@ -775,6 +775,9 @@ typedef struct _ScrnInfoRec { + ClockRangePtr clockRanges; int adjustFlags; + /* -nr support */ @@ -130,10 +130,10 @@ index b3c7c70..fcc8c95 100644 extern _X_EXPORT Bool CoreDump; diff --git a/os/utils.c b/os/utils.c -index 00abd63..7bfdf8b 100644 +index d7c8388..40583d0 100644 --- a/os/utils.c +++ b/os/utils.c -@@ -514,6 +514,7 @@ void UseMsg(void) +@@ -513,6 +513,7 @@ void UseMsg(void) #endif ErrorF("-nolisten string don't listen on protocol\n"); ErrorF("-noreset don't reset after last client exists\n"); @@ -141,7 +141,7 @@ index 00abd63..7bfdf8b 100644 ErrorF("-reset reset after last client exists\n"); ErrorF("-p # screen-saver pattern duration (minutes)\n"); ErrorF("-pn accept failure to listen on all ports\n"); -@@ -861,6 +862,8 @@ ProcessCommandLine(int argc, char *argv[]) +@@ -856,6 +857,8 @@ ProcessCommandLine(int argc, char *argv[]) defaultBackingStore = WhenMapped; else if ( strcmp( argv[i], "-wr") == 0) whiteRoot = TRUE; @@ -151,5 +151,5 @@ index 00abd63..7bfdf8b 100644 if(++i < argc) { long reqSizeArg = atol(argv[i]); -- -1.6.0.6 +1.6.6 diff --git a/packages/x11/xserver/xorg-server/patches/xserver-boottime.diff b/packages/x11/xserver/xorg-server/patches/xserver-boottime.diff deleted file mode 100644 index efc85a42ab..0000000000 --- a/packages/x11/xserver/xorg-server/patches/xserver-boottime.diff +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/os/log.c b/os/log.c -index 0860847..2c46f1a 100644 ---- a/os/log.c -+++ b/os/log.c -@@ -255,6 +255,33 @@ LogVWrite(int verb, const char *f, va_list args) - static char tmpBuffer[1024]; - int len = 0; - -+ struct timeval time; -+ time_t tv_sec; -+ suseconds_t tv_usec; -+ static Bool first = TRUE; -+ static time_t start_tv_sec; -+ static suseconds_t start_usec; -+ int diff_sec, diff_usec; -+ -+ gettimeofday(&time, NULL); -+ tv_sec = time.tv_sec; -+ tv_usec = time.tv_usec; -+ if (first == TRUE) { -+ start_tv_sec = tv_sec; -+ start_usec = tv_usec; -+ first = FALSE; -+ } -+ diff_sec = (int)difftime(tv_sec, start_tv_sec); -+ diff_usec = (tv_usec - start_usec); -+ if (diff_usec < 0) { -+ diff_sec--; -+ diff_usec += 1000000; -+ } -+ sprintf(tmpBuffer, "[%d sec: %06d usec]", diff_sec , diff_usec); -+ len = strlen(tmpBuffer); -+ if (logFile) -+ fwrite(tmpBuffer, len, 1, logFile); -+ - /* - * Since a va_list can only be processed once, write the string to a - * buffer, and then write the buffer out to the appropriate output From 825fbbe4a1c028ef1810323f969a0643e2fa14e3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 13:47:04 +0100 Subject: [PATCH 16/24] xorg-server: - update to xorg-server-20100318 --- packages/x11/xserver/xorg-server/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/xserver/xorg-server/url b/packages/x11/xserver/xorg-server/url index e2b23b6bdc..d611943c45 100644 --- a/packages/x11/xserver/xorg-server/url +++ b/packages/x11/xserver/xorg-server/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xorg-server-20100309.tar.bz2 +http://sources.openelec.tv/svn/xorg-server-20100318.tar.bz2 From 04753344e3be3ebc52f5fd3b0811a7630747df3f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 13:47:45 +0100 Subject: [PATCH 17/24] xorg-server: - dont build with libXv and xf86bigfontproto --- packages/x11/xserver/xorg-server/build | 2 -- packages/x11/xserver/xorg-server/install | 1 - 2 files changed, 3 deletions(-) diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build index bb06faf44d..8dd38322e5 100755 --- a/packages/x11/xserver/xorg-server/build +++ b/packages/x11/xserver/xorg-server/build @@ -20,7 +20,6 @@ $SCRIPTS/build libpciaccess $SCRIPTS/build libX11 $SCRIPTS/build libXfont $SCRIPTS/build libxkbfile -$SCRIPTS/build libXv $SCRIPTS/build libdrm $SCRIPTS/build Mesa $SCRIPTS/build openssl @@ -28,7 +27,6 @@ $SCRIPTS/build freetype $SCRIPTS/build libfontenc $SCRIPTS/build pixman $SCRIPTS/build fontsproto -$SCRIPTS/build xf86bigfontproto $SCRIPTS/build udev if [ "$XINERAMA_SUPPORT" = "yes" ]; then diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index 2b968422fe..6919cd49fb 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -9,7 +9,6 @@ $SCRIPTS/install freetype $SCRIPTS/install openssl $SCRIPTS/install libX11 $SCRIPTS/install libXfont -$SCRIPTS/install libXv $SCRIPTS/install libdrm $SCRIPTS/install Mesa $SCRIPTS/install pixman From 57e86e0d38fe0e9f155311d203e35d9c42712b52 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 13:48:03 +0100 Subject: [PATCH 18/24] libXv: - remove package --- packages/x11/lib/libXv/build | 22 ---------------------- packages/x11/lib/libXv/install | 9 --------- packages/x11/lib/libXv/url | 1 - 3 files changed, 32 deletions(-) delete mode 100755 packages/x11/lib/libXv/build delete mode 100755 packages/x11/lib/libXv/install delete mode 100644 packages/x11/lib/libXv/url diff --git a/packages/x11/lib/libXv/build b/packages/x11/lib/libXv/build deleted file mode 100755 index 2fb40a6535..0000000000 --- a/packages/x11/lib/libXv/build +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/build toolchain -$SCRIPTS/build videoproto -$SCRIPTS/build libX11 -$SCRIPTS/build libXext - -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-shared \ - --enable-malloc0returnsnull - -$MAKE - -$MAKEINSTALL \ No newline at end of file diff --git a/packages/x11/lib/libXv/install b/packages/x11/lib/libXv/install deleted file mode 100755 index e64f759591..0000000000 --- a/packages/x11/lib/libXv/install +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/install libX11 -$SCRIPTS/install libXext - -mkdir -p $INSTALL/usr/lib -cp -PR $PKG_BUILD/src/.libs/libXv.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/libXv/url b/packages/x11/lib/libXv/url deleted file mode 100644 index 684639d92a..0000000000 --- a/packages/x11/lib/libXv/url +++ /dev/null @@ -1 +0,0 @@ -http://xorg.freedesktop.org/archive/individual/lib/libXv-1.0.5.tar.bz2 \ No newline at end of file From 656e57980ea34654f8d3e2e0c118f36d4c74484e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 19 Mar 2010 13:48:28 +0100 Subject: [PATCH 19/24] xf86bigfontproto: - remove package --- packages/x11/proto/xf86bigfontproto/build | 15 --------------- packages/x11/proto/xf86bigfontproto/url | 1 - 2 files changed, 16 deletions(-) delete mode 100755 packages/x11/proto/xf86bigfontproto/build delete mode 100644 packages/x11/proto/xf86bigfontproto/url diff --git a/packages/x11/proto/xf86bigfontproto/build b/packages/x11/proto/xf86bigfontproto/build deleted file mode 100755 index 61467203fa..0000000000 --- a/packages/x11/proto/xf86bigfontproto/build +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/build toolchain - -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - -make - -$MAKEINSTALL diff --git a/packages/x11/proto/xf86bigfontproto/url b/packages/x11/proto/xf86bigfontproto/url deleted file mode 100644 index 62905892af..0000000000 --- a/packages/x11/proto/xf86bigfontproto/url +++ /dev/null @@ -1 +0,0 @@ -http://xorg.freedesktop.org/archive/individual/proto/xf86bigfontproto-1.2.0.tar.bz2 \ No newline at end of file From 97cd12b9225666b90b3e8b60cf5ee24981f74b2f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 20 Mar 2010 02:21:45 +0100 Subject: [PATCH 20/24] glib: - downgrade to glib-2.23.1 --- .../glib-2.23.5-fix_compiling-0.3.diff | 70 ------------------- .../devel/glib/patches/glib-i386-atomic.diff | 15 ++++ packages/devel/glib/url | 2 +- 3 files changed, 16 insertions(+), 71 deletions(-) delete mode 100644 packages/devel/glib/patches/glib-2.23.5-fix_compiling-0.3.diff create mode 100644 packages/devel/glib/patches/glib-i386-atomic.diff diff --git a/packages/devel/glib/patches/glib-2.23.5-fix_compiling-0.3.diff b/packages/devel/glib/patches/glib-2.23.5-fix_compiling-0.3.diff deleted file mode 100644 index 8e81ba0f28..0000000000 --- a/packages/devel/glib/patches/glib-2.23.5-fix_compiling-0.3.diff +++ /dev/null @@ -1,70 +0,0 @@ -diff -Naur glib-2.23.5/gio/Makefile.am glib-2.23.5.patch/gio/Makefile.am ---- glib-2.23.5/gio/Makefile.am 2010-03-06 17:51:40.000000000 +0100 -+++ glib-2.23.5.patch/gio/Makefile.am 2010-03-09 09:38:50.205664589 +0100 -@@ -466,6 +466,7 @@ - $(top_builddir)/glib/libglib-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la \ - $(top_builddir)/gmodule/libgmodule-2.0.la \ -+ $(top_builddir)/gthread/libgthread-2.0.la \ - libgio-2.0.la \ - $(NULL) - -diff -Naur glib-2.23.5/gio/Makefile.in glib-2.23.5.patch/gio/Makefile.in ---- glib-2.23.5/gio/Makefile.in 2010-03-08 16:35:06.000000000 +0100 -+++ glib-2.23.5.patch/gio/Makefile.in 2010-03-09 09:39:16.717664516 +0100 -@@ -824,6 +824,7 @@ - $(top_builddir)/glib/libglib-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la \ - $(top_builddir)/gmodule/libgmodule-2.0.la \ -+ $(top_builddir)/gthread/libgthread-2.0.la \ - libgio-2.0.la \ - $(NULL) - -diff -Naur glib-2.23.5/gio/tests/Makefile.am glib-2.23.5.patch/gio/tests/Makefile.am ---- glib-2.23.5/gio/tests/Makefile.am 2010-03-06 17:51:40.000000000 +0100 -+++ glib-2.23.5.patch/gio/tests/Makefile.am 2010-03-09 09:39:44.816664472 +0100 -@@ -14,6 +14,8 @@ - progs_ldadd = \ - $(top_builddir)/glib/libglib-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la \ -+ $(top_builddir)/gmodule/libgmodule-2.0.la \ -+ $(top_builddir)/gthread/libgthread-2.0.la \ - $(top_builddir)/gio/libgio-2.0.la - - -diff -Naur glib-2.23.5/gio/tests/Makefile.in glib-2.23.5.patch/gio/tests/Makefile.in ---- glib-2.23.5/gio/tests/Makefile.in 2010-03-08 16:35:07.000000000 +0100 -+++ glib-2.23.5.patch/gio/tests/Makefile.in 2010-03-09 09:40:11.250664543 +0100 -@@ -448,6 +448,8 @@ - progs_ldadd = \ - $(top_builddir)/glib/libglib-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la \ -+ $(top_builddir)/gmodule/libgmodule-2.0.la \ -+ $(top_builddir)/gthread/libgthread-2.0.la \ - $(top_builddir)/gio/libgio-2.0.la - - SAMPLE_PROGS = \ -diff -Naur glib-2.23.5/tests/Makefile.am glib-2.23.5.patch/tests/Makefile.am ---- glib-2.23.5/tests/Makefile.am 2010-01-22 03:57:55.000000000 +0100 -+++ glib-2.23.5.patch/tests/Makefile.am 2010-03-09 09:36:39.805664621 +0100 -@@ -86,7 +86,7 @@ - assert_msg_test_LDADD = $(libglib) - if ENABLE_TIMELOOP - timeloop_LDADD = $(libglib) --timeloop_closure_LDADD = $(libglib) $(libgobject) -+timeloop_closure_LDADD = $(libglib) $(libgobject) $(libgthread) - endif - - test_programs = \ -diff -Naur glib-2.23.5/tests/Makefile.in glib-2.23.5.patch/tests/Makefile.in ---- glib-2.23.5/tests/Makefile.in 2010-03-08 16:35:08.000000000 +0100 -+++ glib-2.23.5.patch/tests/Makefile.in 2010-03-09 09:37:22.598664379 +0100 -@@ -692,7 +692,7 @@ - errorcheck_mutex_test_LDADD = $(libglib) $(libgthread) $(G_THREAD_LIBS) - assert_msg_test_LDADD = $(libglib) - @ENABLE_TIMELOOP_TRUE@timeloop_LDADD = $(libglib) --@ENABLE_TIMELOOP_TRUE@timeloop_closure_LDADD = $(libglib) $(libgobject) -+@ENABLE_TIMELOOP_TRUE@timeloop_closure_LDADD = $(libglib) $(libgobject) $(libgthread) - test_programs = \ - atomic-test \ - base64-test \ diff --git a/packages/devel/glib/patches/glib-i386-atomic.diff b/packages/devel/glib/patches/glib-i386-atomic.diff new file mode 100644 index 0000000000..01495c0070 --- /dev/null +++ b/packages/devel/glib/patches/glib-i386-atomic.diff @@ -0,0 +1,15 @@ +diff -up glib-2.16.6/configure.atomic glib-2.16.6/configure +--- glib-2.16.6/configure.atomic 2008-10-27 18:24:20.000000000 -0400 ++++ glib-2.16.6/configure 2008-10-27 18:24:31.000000000 -0400 +@@ -42742,11 +42742,6 @@ $as_echo_n "checking whether to use asse + + if test x"$GCC" = xyes; then + case $host_cpu in +- i386) +- { $as_echo "$as_me:$LINENO: result: none" >&5 +-$as_echo "none" >&6; } +- glib_memory_barrier_needed=no +- ;; + i?86) + { $as_echo "$as_me:$LINENO: result: i486" >&5 + $as_echo "i486" >&6; } diff --git a/packages/devel/glib/url b/packages/devel/glib/url index 9c5b1fe999..1313421652 100644 --- a/packages/devel/glib/url +++ b/packages/devel/glib/url @@ -1 +1 @@ -http://ftp.gnome.org/pub/GNOME/sources/glib/2.23/glib-2.23.5.tar.bz2 +http://ftp.gnome.org/pub/GNOME/sources/glib/2.23/glib-2.23.1.tar.bz2 From d9bab33d1366ed102287cbd61d2c86b42a34bd0e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 20 Mar 2010 02:22:14 +0100 Subject: [PATCH 21/24] xbmc: - remove patch to fix build with glib-2.23.x --- .../patches/xbmc-undef_byte_for_glib-2.23.x-0.1.diff | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-undef_byte_for_glib-2.23.x-0.1.diff diff --git a/packages/mediacenter/xbmc/patches/xbmc-undef_byte_for_glib-2.23.x-0.1.diff b/packages/mediacenter/xbmc/patches/xbmc-undef_byte_for_glib-2.23.x-0.1.diff deleted file mode 100644 index 0b72e14a70..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-undef_byte_for_glib-2.23.x-0.1.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur xbmc-28622/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMMS.cpp xbmc-28622.patch/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMMS.cpp ---- xbmc-28622/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMMS.cpp 2010-03-17 20:11:42.000000000 +0100 -+++ xbmc-28622.patch/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMMS.cpp 2010-03-19 04:04:41.074751644 +0100 -@@ -35,6 +35,7 @@ - // some distros have already patched this but upstream @ https://launchpad.net/libmms - // does still has the "this" usage. - #define this instance -+#undef byte - #include // FIXME: remove this header once the ubuntu headers is fixed (variable named this) - #include - #include From 8f1adb5331dd9e16e24bac3b4bf0e84d06fcbed4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 20 Mar 2010 02:22:41 +0100 Subject: [PATCH 22/24] xf86-video-ati: - dont build libXv (not needed) --- packages/x11/driver/xf86-video-ati/build | 1 - packages/x11/driver/xf86-video-ati/install | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/x11/driver/xf86-video-ati/build b/packages/x11/driver/xf86-video-ati/build index 1103f17d27..e1d39221bf 100755 --- a/packages/x11/driver/xf86-video-ati/build +++ b/packages/x11/driver/xf86-video-ati/build @@ -5,7 +5,6 @@ $SCRIPTS/build toolchain $SCRIPTS/build libXrandr $SCRIPTS/build libXrender -$SCRIPTS/build libXv $SCRIPTS/build libXext $SCRIPTS/build libpciaccess $SCRIPTS/build libdrm diff --git a/packages/x11/driver/xf86-video-ati/install b/packages/x11/driver/xf86-video-ati/install index 1f4b9c1dda..b8559a77ba 100755 --- a/packages/x11/driver/xf86-video-ati/install +++ b/packages/x11/driver/xf86-video-ati/install @@ -4,7 +4,6 @@ $SCRIPTS/install libXrandr $SCRIPTS/install libXrender -$SCRIPTS/install libXv $SCRIPTS/install libXext $SCRIPTS/install libpciaccess $SCRIPTS/install libdrm From da1b13c477439c88f07c3d977aa8c515ee987a2b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 24 Mar 2010 12:48:30 +0100 Subject: [PATCH 23/24] merging trunk --- .../mediacenter/xbmc-theme-Confluence/url | 2 +- packages/mediacenter/xbmc/build | 2 + ...d_host_and_build_to_configures-0.3.1.diff} | 85 +++++++++++++++---- .../091-xbmc-enable_yasm_in_ffmpeg-0.1.diff | 22 ++--- packages/mediacenter/xbmc/url | 2 +- packages/network/connman/build | 2 + packages/network/connman/url | 2 +- 7 files changed, 85 insertions(+), 32 deletions(-) rename packages/mediacenter/xbmc/patches/{010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.1.diff => 010_xbmc-crosscompile_add_host_and_build_to_configures-0.3.1.diff} (62%) diff --git a/packages/mediacenter/xbmc-theme-Confluence/url b/packages/mediacenter/xbmc-theme-Confluence/url index 0066bc213d..11a228eb9f 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/url +++ b/packages/mediacenter/xbmc-theme-Confluence/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-theme-Confluence-28690.tar.bz2 +http://sources.openelec.tv/svn/xbmc-theme-Confluence-28745.tar.bz2 diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index b1cde99c34..00673e71bc 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -91,6 +91,8 @@ cd - ./bootstrap ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ + --with-arch=$TARGET_ARCH \ + --with-cpu=$TARGET_CPU \ --prefix=/usr \ --exec-prefix=/usr \ --sysconfdir=/etc \ diff --git a/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.1.diff b/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.3.1.diff similarity index 62% rename from packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.1.diff rename to packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.3.1.diff index 033babe263..24e5fb71f2 100644 --- a/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.1.diff +++ b/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.3.1.diff @@ -1,7 +1,53 @@ -diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in ---- xbmc-28584/configure.in 2010-03-14 21:06:24.000000000 +0100 -+++ xbmc-28584.patch/configure.in 2010-03-15 00:50:53.680149619 +0100 -@@ -1154,7 +1154,9 @@ +diff -Naur xbmc-28745/configure.in xbmc-28745.patch/configure.in +--- xbmc-28745/configure.in 2010-03-22 06:50:58.000000000 +0100 ++++ xbmc-28745.patch/configure.in 2010-03-22 13:17:49.917999744 +0100 +@@ -24,6 +24,10 @@ + + AC_CANONICAL_HOST + ++tolower(){ ++ echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz ++} ++ + # General message strings + configure_debug="ERROR: this is a configure debug statement" + missing_library="Could not find a required library. Please see the README for your platform." +@@ -102,6 +106,18 @@ + [use_debug=$enableval], + [use_debug=yes]) + ++AC_ARG_WITH([arch], ++ [AS_HELP_STRING([--with-arch], ++ [build with given arch passing to internal ffmpeg (default is no, needed for crosscompiling)])], ++ [use_arch=$withval], ++ [use_arch=no]) ++ ++AC_ARG_WITH([cpu], ++ [AS_HELP_STRING([--with-cpu], ++ [build with given cpu passing to ffmpeg (default is no)])], ++ [use_cpu=$withval], ++ [use_cpu=no]) ++ + AC_ARG_ENABLE([optimizations], + [AS_HELP_STRING([--enable-optimizations], + [enable optimization (default is yes)])], +@@ -805,6 +821,15 @@ + fi + fi + ++if test "$cross_compiling" = "yes"; then ++ final_message="$final_message\n Crosscomp.:\tYes" ++else ++ final_message="$final_message\n Crosscomp.:\tNo" ++fi ++ ++final_message="$final_message\n target ARCH:\t$use_arch" ++final_message="$final_message\n target CPU:\t$use_cpu" ++ + if test "$use_optimizations" = "yes"; then + final_message="$final_message\n Optimization:\tYes" + CXXFLAGS="$CXXFLAGS -O2" +@@ -1154,7 +1179,9 @@ cp pyconfig.h Include else ./configure \ @@ -12,15 +58,18 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in --enable-unicode=ucs4 \ --without-cxx \ --enable-shared \ -@@ -1219,6 +1221,7 @@ +@@ -1217,6 +1244,10 @@ + ./configure \ --disable-static \ - --disable-ipv6 \ `if test "$use_debug" = "no"; then echo --disable-debug; fi` \ + `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \ ++ `if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\ ++ `if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\ ++ --target-os=$(tolower $(uname -s)) \ --disable-muxers \ --enable-muxer=spdif \ --enable-muxer=adts \ -@@ -1235,6 +1238,7 @@ +@@ -1233,6 +1264,7 @@ --enable-postproc \ --enable-gpl \ `if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \ @@ -28,7 +77,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in --enable-libfaad \ --enable-protocol=http \ --enable-pthreads \ -@@ -1254,6 +1258,8 @@ +@@ -1252,6 +1284,8 @@ --disable-win else ./configure \ @@ -37,7 +86,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in --disable-oss \ --disable-solaris-audio \ --disable-al-audio \ -@@ -1271,6 +1277,8 @@ +@@ -1269,6 +1303,8 @@ --with-pic else ./configure \ @@ -46,7 +95,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in --disable-doc \ --enable-static \ --with-pic -@@ -1289,6 +1297,8 @@ +@@ -1287,6 +1323,8 @@ cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread else ./configure2 \ @@ -55,7 +104,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ --enable-static \ -@@ -1314,6 +1324,8 @@ +@@ -1312,6 +1350,8 @@ --cc="$CC" else ./configure2 \ @@ -64,7 +113,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \ --extra-ldflags="-L`pwd`/../libdvdread/obj" \ --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ -@@ -1346,6 +1358,8 @@ +@@ -1344,6 +1384,8 @@ --disable-al-audio else ./configure \ @@ -73,7 +122,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in --with-pic \ --disable-static \ --enable-shared \ -@@ -1381,7 +1395,9 @@ +@@ -1379,7 +1421,9 @@ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 else CFLAGS="$CFLAGS -fPIC" \ @@ -84,7 +133,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in fi ], [$USE_EXTERNAL_LIBASS]) -@@ -1395,6 +1411,8 @@ +@@ -1393,6 +1437,8 @@ --with-pic else ./configure \ @@ -93,7 +142,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in CPPFLAGS="$CPPFLAGS" \ CFLAGS="$CFLAGS -fPIC" \ CXXFLAGS="$CXXFLAGS -fPIC" \ -@@ -1421,6 +1439,8 @@ +@@ -1419,6 +1465,8 @@ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ if test "$host_vendor" != "apple" ; then ./configure \ @@ -102,7 +151,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in CPPFLAGS="$CPPFLAGS" \ CFLAGS="$CFLAGS -fPIC" \ CXXFLAGS="$CXXFLAGS -fPIC" \ -@@ -1451,6 +1471,8 @@ +@@ -1449,6 +1497,8 @@ --disable-skyrocket else ./configure \ @@ -111,7 +160,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in CPPFLAGS="$CPPFLAGS" \ CFLAGS="$CFLAGS -fPIC" \ CXXFLAGS="$CXXFLAGS -fPIC" \ -@@ -1470,9 +1492,11 @@ +@@ -1468,9 +1518,11 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [ if test "$host_vendor" = "apple" ; then @@ -125,7 +174,7 @@ diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in fi ], [0]) -@@ -1481,7 +1505,9 @@ +@@ -1479,7 +1531,9 @@ CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \ ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared else diff --git a/packages/mediacenter/xbmc/patches/091-xbmc-enable_yasm_in_ffmpeg-0.1.diff b/packages/mediacenter/xbmc/patches/091-xbmc-enable_yasm_in_ffmpeg-0.1.diff index 8ad37ff7d2..be58e79acc 100644 --- a/packages/mediacenter/xbmc/patches/091-xbmc-enable_yasm_in_ffmpeg-0.1.diff +++ b/packages/mediacenter/xbmc/patches/091-xbmc-enable_yasm_in_ffmpeg-0.1.diff @@ -1,7 +1,7 @@ -diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in ---- xbmc-23998/configure.in 2009-10-25 13:30:40.869660379 +0100 -+++ xbmc-23998.patch/configure.in 2009-10-25 13:33:30.376657368 +0100 -@@ -692,6 +692,7 @@ +diff -Naur xbmc-28745/configure.in xbmc-28745.patch/configure.in +--- xbmc-28745/configure.in 2010-03-23 04:05:13.476967336 +0100 ++++ xbmc-28745.patch/configure.in 2010-03-23 04:07:49.166967342 +0100 +@@ -728,6 +728,7 @@ fi fi @@ -9,11 +9,11 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in AC_CHECK_PROG(HAVE_SVNVERSION,svnversion,"yes","no",) AC_CHECK_PROG(HAVE_GIT,git,"yes","no",) -@@ -1177,6 +1178,7 @@ - --disable-ipv6 \ - `if test "$use_debug" = "no"; then echo --disable-debug; fi` \ - `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \ +@@ -1269,6 +1270,7 @@ + --enable-protocol=http \ + --enable-pthreads \ + `if test "$host_cpu" = "powerpc" || test "$host_cpu" = "powerpc64"; then echo --enable-pic; fi` \ + `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` \ - --disable-muxers \ - --disable-encoders \ - --disable-decoder=mpeg_xvmc \ + --cc="$CC" + fi + ], [$USE_EXTERNAL_FFMPEG]) diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url index aa8d60462b..bb1f20911b 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-28690.tar.bz2 +http://sources.openelec.tv/svn/xbmc-28745.tar.bz2 diff --git a/packages/network/connman/build b/packages/network/connman/build index ad061c360d..be5ecc05ea 100755 --- a/packages/network/connman/build +++ b/packages/network/connman/build @@ -16,6 +16,7 @@ cd $PKG_BUILD --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --disable-debug \ --disable-static \ --enable-shared \ --enable-threads \ @@ -48,3 +49,4 @@ cd $PKG_BUILD --disable-capng \ make + diff --git a/packages/network/connman/url b/packages/network/connman/url index eca469eb2f..63738c5d19 100644 --- a/packages/network/connman/url +++ b/packages/network/connman/url @@ -1 +1 @@ -http://www.kernel.org/pub/linux/network/connman/connman-0.48.tar.bz2 +http://www.kernel.org/pub/linux/network/connman/connman-0.50.tar.bz2 From a84911d0c9a4bcd444aaadeb84d0f85f1d96402a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 6 May 2010 17:10:22 +0200 Subject: [PATCH 24/24] mesa: - update to mesa-7.8.1 --- packages/graphics/Mesa/url | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphics/Mesa/url b/packages/graphics/Mesa/url index 5df86152e7..2e47b0d64e 100644 --- a/packages/graphics/Mesa/url +++ b/packages/graphics/Mesa/url @@ -1,2 +1,2 @@ -ftp://freedesktop.org/pub/mesa/7.8/MesaLib-7.8.tar.bz2 -ftp://freedesktop.org/pub/mesa/7.8/MesaDemos-7.8.tar.bz2 +ftp://freedesktop.org/pub/mesa/7.8.1/MesaLib-7.8.1.tar.bz2 +ftp://freedesktop.org/pub/mesa/7.8.1/MesaDemos-7.8.1.tar.bz2