December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit xorg-x11-driver-video
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Mon Dec 11 01:51:02 CET 2006. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-12-07 12:46:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-12-09 11:03:34.000000000 +0100 @@ -1,0 +2,19 @@ +Sat Dec 9 11:02:32 CET 2006 - sndirsch(a)suse.de + +- added optional "i810sdvo" driver for SDVO support + ("modesetting-sdvo-stuffing" branch) + +------------------------------------------------------------------- +Fri Dec 8 18:24:35 CET 2006 - sndirsch(a)suse.de + +- intel modesetting driver: back to GIT 2006-11-21 due to undefined + xf86DDCGetModes symbol (requires newer xserver) + +------------------------------------------------------------------- +Fri Dec 8 06:45:45 CET 2006 - sndirsch(a)suse.de + +- updated vmware driver to release 10.14.1 + * Fix use of uninitialised buffer in static xinerama topology + parsing + +------------------------------------------------------------------- Old: ---- xf86-video-intel.modesetting-20061204.tar.bz2 xf86-video-vmware-10.14.0.tar.bz2 New: ---- xf86-video-intel.modesetting-20061121.tar.bz2 xf86-video-intel.modesetting-sdvo-stuffing-20061209.tar.bz2 xf86-video-intel.modesetting-sdvo-stuffing.diff xf86-video-vmware-10.14.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.yMy8az/_old 2006-12-11 01:50:42.000000000 +0100 +++ /var/tmp/diff_new_pack.yMy8az/_new 2006-12-11 01:50:42.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 33 +Release: 34 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -62,11 +62,12 @@ Source38: xf86-video-vesa-1.3.0.tar.bz2 Source39: xf86-video-vga-X11R7.1-4.1.0.tar.bz2 Source40: xf86-video-via-0.2.2.tar.bz2 -Source41: xf86-video-vmware-10.14.0.tar.bz2 +Source41: xf86-video-vmware-10.14.1.tar.bz2 Source42: xf86-video-voodoo-1.1.1.tar.bz2 Source43: xf86-video-impact-0.2.0.tar.bz2 Source44: HALlib-4.1.tar.gz -Source45: xf86-video-intel.modesetting-20061204.tar.bz2 +Source45: xf86-video-intel.modesetting-20061121.tar.bz2 +Source46: xf86-video-intel.modesetting-sdvo-stuffing-20061209.tar.bz2 Patch1: radeon-xrandr-dotclock.diff Patch2: radeon_dell.diff Patch3: ps_nv.diff @@ -81,6 +82,7 @@ Patch17: p_i810-refresh.diff Patch18: radeon-vbios-ppc.diff Patch24: xf86-video-intel.modesetting.diff +Patch25: xf86-video-intel.modesetting-sdvo-stuffing.diff Patch29: xf86-video-fbdev-disable-shadowfb.diff %description @@ -136,10 +138,15 @@ %patch24 -p0 mv man/i810.man man/i810beta.man popd +pushd xf86-video-intel.modesetting-sdvo-stuffing +%patch25 -p0 +mv man/i810.man man/i810sdvo.man +popd %build for dir in xf86-video-via-* \ xf86-video-intel.modesetting \ + xf86-video-intel.modesetting-sdvo-stuffing \ xf86-video-nv-* \ xf86-video-i810-* \ xf86-video-mga-* \ @@ -147,6 +154,7 @@ $(ls | grep -v -e xf86-video-impact \ -e xf86-video-via \ -e xf86-video-intel.modesetting \ + -e xf86-video-intel.modesetting-sdvo-stuffing \ -e xf86-video-nv \ -e xf86-video-i810 \ -e xf86-video-mga \ @@ -155,6 +163,7 @@ case $dir in xf86-video-i810-* | \ xf86-video-intel.modesetting | \ + xf86-video-intel.modesetting-sdvo-stuffing | \ xf86-video-mga-* | \ xf86-video-nsc-*) autoreconf -fi ;; *) ;; @@ -167,11 +176,14 @@ %install for dir in $(ls | grep -v -e xf86-video-impact \ + -e xf86-video-intel.modesetting-sdvo-stuffing \ -e xf86-video-intel.modesetting); do make -C $dir install DESTDIR=$RPM_BUILD_ROOT done install -m 755 xf86-video-intel.modesetting/src/.libs/i810_drv.so \ $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/drivers/i810beta_drv.so +install -m 755 xf86-video-intel.modesetting-sdvo-stuffing/src/.libs/i810_drv.so \ + $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/drivers/i810sdvo_drv.so ln -snf nv_drv.so \ $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/drivers/nvidia_drv.so %ifarch %ix86 @@ -194,6 +206,16 @@ %{_mandir}/man4/* %changelog -n xorg-x11-driver-video +* Sat Dec 09 2006 - sndirsch(a)suse.de +- added optional "i810sdvo" driver for SDVO support + ("modesetting-sdvo-stuffing" branch) +* Fri Dec 08 2006 - sndirsch(a)suse.de +- intel modesetting driver: back to GIT 2006-11-21 due to undefined + xf86DDCGetModes symbol (requires newer xserver) +* Fri Dec 08 2006 - sndirsch(a)suse.de +- updated vmware driver to release 10.14.1 + * Fix use of uninitialised buffer in static xinerama topology + parsing * Thu Dec 07 2006 - sndirsch(a)suse.de - updated i810 driver to release 1.7.3 * Make VIDEO_DEBUG into a configure option ++++++ xf86-video-intel.modesetting-20061204.tar.bz2 -> xf86-video-intel.modesetting-20061121.tar.bz2 ++++++ ++++ 12111 lines of diff (skipped) ++++++ xf86-video-intel.modesetting-sdvo-stuffing.diff ++++++ diff -u -r ../xf86-video-intel.modesetting.orig/configure.ac ./configure.ac --- ../xf86-video-intel.modesetting.orig/configure.ac 2006-10-30 12:58:58.000000000 +0100 +++ ./configure.ac 2006-10-30 13:01:09.000000000 +0100 @@ -125,7 +125,7 @@ AC_SUBST([WARN_CFLAGS]) AC_SUBST([moduledir]) -DRIVER_NAME=i810 +DRIVER_NAME=i810sdvo AC_SUBST([DRIVER_NAME]) XORG_MANPAGE_SECTIONS diff -u -r ../xf86-video-intel.modesetting.orig/src/i810_driver.c ./src/i810_driver.c --- ../xf86-video-intel.modesetting.orig/src/i810_driver.c 2006-10-30 12:58:58.000000000 +0100 +++ ./src/i810_driver.c 2006-10-30 13:03:07.000000000 +0100 @@ -382,7 +382,7 @@ static MODULESETUPPROTO(i810Setup); static XF86ModuleVersionInfo i810VersRec = { - "i810", + "i810sdvo", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, @@ -394,7 +394,7 @@ {0, 0, 0, 0} }; -_X_EXPORT XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, 0 }; +_X_EXPORT XF86ModuleData i810sdvoModuleData = { &i810VersRec, i810Setup, 0 }; static pointer i810Setup(pointer module, pointer opts, int *errmaj, int *errmin) --- ./src/i810.h.orig 2006-12-09 11:11:54.571771963 +0100 +++ ./src/i810.h 2006-12-09 11:13:01.971581562 +0100 @@ -62,8 +62,8 @@ #include "common.h" #define I810_VERSION 4000 -#define I810_NAME "I810" -#define I810_DRIVER_NAME "i810" +#define I810_NAME "I810SDVO" +#define I810_DRIVER_NAME "i810sdvo" #define I810_MAJOR_VERSION 1 #define I810_MINOR_VERSION 6 #define I810_PATCHLEVEL 0 ++++++ xf86-video-vmware-10.14.0.tar.bz2 -> xf86-video-vmware-10.14.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-vmware-10.14.0/configure new/xf86-video-vmware-10.14.1/configure --- old/xf86-video-vmware-10.14.0/configure 2006-11-01 04:12:53.000000000 +0100 +++ new/xf86-video-vmware-10.14.1/configure 2006-12-07 01:54:28.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for xf86-video-vmware 10.14.0. +# Generated by GNU Autoconf 2.60 for xf86-video-vmware 10.14.1. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-vmware' PACKAGE_TARNAME='xf86-video-vmware' -PACKAGE_VERSION='10.14.0' -PACKAGE_STRING='xf86-video-vmware 10.14.0' +PACKAGE_VERSION='10.14.1' +PACKAGE_STRING='xf86-video-vmware 10.14.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1396,7 +1396,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-video-vmware 10.14.0 to adapt to many kinds of systems. +\`configure' configures xf86-video-vmware 10.14.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1466,7 +1466,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-vmware 10.14.0:";; + short | recursive ) echo "Configuration of xf86-video-vmware 10.14.1:";; esac cat <<\_ACEOF @@ -1577,7 +1577,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-video-vmware configure 10.14.0 +xf86-video-vmware configure 10.14.1 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1591,7 +1591,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-video-vmware $as_me 10.14.0, which was +It was created by xf86-video-vmware $as_me 10.14.1, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2266,7 +2266,7 @@ # Define the identity of the package. PACKAGE='xf86-video-vmware' - VERSION='10.14.0' + VERSION='10.14.1' cat >>confdefs.h <<_ACEOF @@ -21896,7 +21896,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-video-vmware $as_me 10.14.0, which was +This file was extended by xf86-video-vmware $as_me 10.14.1, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21949,7 +21949,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-vmware config.status 10.14.0 +xf86-video-vmware config.status 10.14.1 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-vmware-10.14.0/configure.ac new/xf86-video-vmware-10.14.1/configure.ac --- old/xf86-video-vmware-10.14.0/configure.ac 2006-11-01 04:11:54.000000000 +0100 +++ new/xf86-video-vmware-10.14.1/configure.ac 2006-12-07 01:47:15.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-vmware], - 10.14.0, + 10.14.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-video-vmware) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-vmware-10.14.0/src/vmware.c new/xf86-video-vmware-10.14.1/src/vmware.c --- old/xf86-video-vmware-10.14.0/src/vmware.c 2006-11-01 04:12:05.000000000 +0100 +++ new/xf86-video-vmware-10.14.1/src/vmware.c 2006-12-07 01:47:28.000000000 +0100 @@ -82,7 +82,7 @@ #define VMWARE_DRIVER_NAME "vmware" #define VMWARE_MAJOR_VERSION 10 #define VMWARE_MINOR_VERSION 14 -#define VMWARE_PATCHLEVEL 0 +#define VMWARE_PATCHLEVEL 1 #define VMWARE_DRIVER_VERSION \ (VMWARE_MAJOR_VERSION * 65536 + VMWARE_MINOR_VERSION * 256 + VMWARE_PATCHLEVEL) @@ -433,7 +433,7 @@ Bool needTerminator, unsigned int *outValue) { - char buf[10]; + char buf[10] = {0, }; size_t i = 0; int retVal = -1; const char *str = element; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-Xvnc
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package xorg-x11-Xvnc checked in at Mon Dec 11 01:50:56 CET 2006. -------- --- xorg-x11-Xvnc/xorg-x11-Xvnc.changes 2006-11-02 18:00:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-Xvnc/xorg-x11-Xvnc.changes 2006-12-10 22:37:41.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Dec 10 22:37:18 CET 2006 - sndirsch(a)suse.de + +- updated xorg-xserver sources to 1.1.1 + +------------------------------------------------------------------- +Fri Dec 8 20:46:32 CET 2006 - sndirsch(a)suse.de + +- warning-fix.diff: + * fixed fatal warning + +------------------------------------------------------------------- Old: ---- xorg-server-1.1.0.tar.bz2 New: ---- vnc-102434.patch vnc-188169.patch vnc-210617.patch vnc-build.patch vnc-config.patch vnc-cookie.patch vnc-newfbsize.patch vnc-nohttpd.patch vnc-null-interface.patch vnc-render.patch vnc-xclients.patch warning-fix.diff xorg-server-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-Xvnc.spec ++++++ --- /var/tmp/diff_new_pack.7Qzfb5/_old 2006-12-11 01:50:42.000000000 +0100 +++ /var/tmp/diff_new_pack.7Qzfb5/_new 2006-12-11 01:50:42.000000000 +0100 @@ -10,11 +10,11 @@ Name: xorg-x11-Xvnc -%define xorg_version 1.1.0 +%define xorg_version 1.1.1 %define vnc_version 4_1_2 Summary: VNC Server for the X Window System Version: 7.1 -Release: 16 +Release: 22 URL: http://xorg.freedesktop.org/ %if %suse_version <= 1010 Provides: XFree86-Xvnc @@ -22,24 +22,36 @@ Requires: xorg-x11-fonts-core Source0: http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz Source2: xorg-server-%{xorg_version}.tar.bz2 +Patch0: vnc-cookie.patch Patch1: vnc-gcc4.patch Patch2: vnc-use-fb.patch +Patch3: vnc-xclients.patch Patch4: vnc-idle.patch Patch5: vnc-via.patch +Patch6: vnc-build.patch Patch7: vnc-fPIC.patch Patch8: vnc-restart.patch Patch9: vnc-vncpasswd.patch Patch10: vnc-def.patch Patch11: vnc-modular-xorg.patch +Patch12: vnc-nohttpd.patch Patch13: vnc-fontpath.patch Patch14: vnc-s390.patch Patch15: vnc-viewer-reparent.patch Patch16: vnc-64bit.patch Patch17: vnc-select.patch +Patch18: vnc-null-interface.patch Patch19: vnc-ppc64.patch Patch20: vnc-opengl.patch -Patch22: 64bit.diff -License: GNU General Public License (GPL) - all versions +Patch21: vnc-newfbsize.patch +Patch22: vnc-188169.patch +Patch23: vnc-210617.patch +Patch24: vnc-102434.patch +Patch25: vnc-config.patch +Patch26: vnc-render.patch +Patch27: 64bit.diff +Patch28: warning-fix.diff +License: GNU General Public License (GPL) Group: System/X11/Servers/XF86_4 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel expat freetype2-devel gcc-c++ libjpeg-devel pkgconfig xorg-x11-devel @@ -54,25 +66,37 @@ pushd unix bzip2 -dc %{SOURCE2} | tar -xkf - || : popd +%patch0 -p1 -b .cookie %patch1 -p1 -b .gcc4 %patch2 -p1 -b .use-fb +%patch3 -p1 -b .xclients %patch4 -p1 -b .idle %patch5 -p1 -b .via +%patch6 -p1 -b .build %patch7 -p1 -b .fPIC %patch8 -p1 -b .restart %patch9 -p1 -b .vncpasswd %patch10 -p1 -b .def %patch11 -p1 -b .modular-xorg +%patch12 -p1 -b .nohttpd pushd unix/xorg-server-* %patch13 -p3 -b .fontpath %patch14 -p3 -b .s390 +%patch28 popd %patch15 -p1 -b .viewer-reparent %patch16 -p1 -b .64bit %patch17 -p1 -b .select +#patch18 -p1 -b .null-interface %patch19 -p1 -b .ppc64 %patch20 -p1 -b .opengl -%patch22 -p0 -b .64bit +%patch21 -p1 -b .newfbsize +%patch22 -p1 -b .fix +%patch23 -p1 -b .ipv6 +%patch24 -p1 -b .102434 +%patch25 -p1 -b .config +%patch26 -p1 -b .render +%patch27 cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \ unix/xc/programs/Xserver/Xvnc.man \ unix/xc/programs/Xserver/vnc/*.{h,cc} \ @@ -85,7 +109,8 @@ %build cd common -%configure --with-installed-zlib +autoconf # For use-fb patch +%configure --with-installed-zlib --with-fb make cd ../unix/xorg-server-* autoreconf -fi @@ -141,6 +166,11 @@ %endif %changelog -n xorg-x11-Xvnc +* Sun Dec 10 2006 - sndirsch(a)suse.de +- updated xorg-xserver sources to 1.1.1 +* Fri Dec 08 2006 - sndirsch(a)suse.de +- warning-fix.diff: + * fixed fatal warning * Thu Nov 02 2006 - sndirsch(a)suse.de - added Requires: xorg-x11-fonts-core (Bug #217336) * Wed Aug 16 2006 - sndirsch(a)suse.de ++++++ 64bit.diff ++++++ --- /var/tmp/diff_new_pack.7Qzfb5/_old 2006-12-11 01:50:42.000000000 +0100 +++ /var/tmp/diff_new_pack.7Qzfb5/_new 2006-12-11 01:50:42.000000000 +0100 @@ -9,8 +9,8 @@ perror("execlp"); exit(1); } break; ---- unix/xorg-server-1.1.0/xkb/maprules.c.orig 2006-08-09 12:52:29.000000000 +0200 -+++ unix/xorg-server-1.1.0/xkb/maprules.c 2006-08-09 12:55:34.000000000 +0200 +--- unix/xorg-server-1.1.1/xkb/maprules.c.orig 2006-08-09 12:52:29.000000000 +0200 ++++ unix/xorg-server-1.1.1/xkb/maprules.c 2006-08-09 12:55:34.000000000 +0200 @@ -1092,7 +1092,7 @@ for ( ; GetInputLine(file,&line,False); line.num_line= 0) { if (line.line[0]=='!') { @@ -20,8 +20,8 @@ headingtype = HEAD_MODEL; else if (_XkbStrCaseCmp(tok,"layout") == 0) headingtype = HEAD_LAYOUT; ---- unix/xorg-server-1.1.0/hw/xfree86/common.orig/xf86Events.c 2006-06-27 10:16:25.000000000 +0000 -+++ unix/xorg-server-1.1.0/hw/xfree86/common/xf86Events.c 2006-06-27 10:43:01.000000000 +0000 +--- unix/xorg-server-1.1.1/hw/xfree86/common.orig/xf86Events.c 2006-06-27 10:16:25.000000000 +0000 ++++ unix/xorg-server-1.1.1/hw/xfree86/common/xf86Events.c 2006-06-27 10:43:01.000000000 +0000 @@ -1292,8 +1292,8 @@ size_t size, i; char **strings; @@ -33,8 +33,8 @@ for (i = 0; i < size; i++) ErrorF("%d: %s\n", i, strings[i]); free(strings); ---- unix/xorg-server-1.1.0/cfb/cfbblt.c.orig 2006-08-09 14:09:19.000000000 +0200 -+++ unix/xorg-server-1.1.0/cfb/cfbblt.c 2006-08-09 14:10:03.000000000 +0200 +--- unix/xorg-server-1.1.1/cfb/cfbblt.c.orig 2006-08-09 14:09:19.000000000 +0200 ++++ unix/xorg-server-1.1.1/cfb/cfbblt.c 2006-08-09 14:10:03.000000000 +0200 @@ -39,6 +39,7 @@ #endif ++++++ vnc-102434.patch ++++++ --- vnc_4_1_2-unixsrc/unix/vncviewer/CConn.cxx.102434 2006-10-18 10:10:58.000000000 +0200 +++ vnc_4_1_2-unixsrc/unix/vncviewer/CConn.cxx 2006-10-18 10:12:26.000000000 +0200 @@ -206,6 +206,15 @@ return; } + if(passwdInput) + { + char s[25]; + fgets(s, 25, stdin); + *password = strDup(s); + if(user) *user = 0; + return; + } + const char* secType = secTypeName(getCurrentCSecurity()->getType()); const char* titlePrefix = "VNC Authentication"; CharArray title(strlen(titlePrefix) + strlen(secType) + 4); --- vnc_4_1_2-unixsrc/unix/vncviewer/parameters.h.102434 2006-10-18 10:12:45.000000000 +0200 +++ vnc_4_1_2-unixsrc/unix/vncviewer/parameters.h 2006-10-18 10:13:12.000000000 +0200 @@ -38,6 +38,7 @@ extern rfb::BoolParameter fullScreen; extern rfb::StringParameter geometry; extern rfb::StringParameter embedParent; +extern rfb::BoolParameter passwdInput; extern char aboutText[]; extern char* programName; --- vnc_4_1_2-unixsrc/unix/vncviewer/vncviewer.cxx.102434 2006-10-18 10:13:28.000000000 +0200 +++ vnc_4_1_2-unixsrc/unix/vncviewer/vncviewer.cxx 2006-10-18 10:14:21.000000000 +0200 @@ -52,6 +52,7 @@ "manager decoration around a window", 24); StringParameter passwordFile("PasswordFile", "Password file for VNC authentication", ""); +BoolParameter passwdInput("passwdInput", "Gets password from stdin", false); AliasParameter rfbauth("passwd", "Alias for PasswordFile", &passwordFile); BoolParameter useLocalCursor("UseLocalCursor", --- vnc_4_1_2-unixsrc/unix/vncviewer/vncviewer.man.102434 2006-10-18 10:14:37.000000000 +0200 +++ vnc_4_1_2-unixsrc/unix/vncviewer/vncviewer.man 2006-10-18 10:17:22.000000000 +0200 @@ -108,6 +108,11 @@ "~/.vnc/passwd". .TP +.B \-passwdInput \fItrue, false\fP +Force standard vnc dialog to getting password and reads password from stdin. +Default is false(shows dialog window) + +.TP .B \-Shared When you make a connection to a VNC server, all other existing connections are normally closed. This option requests that they be left open, allowing you to ++++++ vnc-188169.patch ++++++ --- vnc-4_1_2-unixsrc/unix/vncviewer/DesktopWindow.cxx.fix 2006-05-15 18:56:20.000000000 +0200 +++ vnc-4_1_2-unixsrc/unix/vncviewer/DesktopWindow.cxx 2006-11-03 15:32:55.000000000 +0100 @@ -370,9 +370,13 @@ break; case ButtonPress: + if(ev->xkey.state & ControlMask) + cc->writer()->keyEvent(XK_Control_L, true); handlePointerEvent(Point(ev->xbutton.x, ev->xbutton.y), (((ev->xbutton.state & 0x1f00) >> 8) | (1 << (ev->xbutton.button-1)))); + if(ev->xkey.state & ControlMask) + cc->writer()->keyEvent(XK_Control_L, false); break; case ButtonRelease: @@ -387,6 +391,16 @@ char keyname[256]; XLookupString(&ev->xkey, keyname, 256, &ks, NULL); bool fakeShiftPress = false; + bool ctrlPressed = false; + + if((ks == XK_Control_L) || (ks == XK_Control_R)) + break; + + if(ev->xkey.state & ControlMask) + { + ctrlPressed = true; + cc->writer()->keyEvent(XK_Control_L, true); + } // Turn ISO_Left_Tab into shifted Tab if (ks == XK_ISO_Left_Tab) { @@ -402,11 +416,19 @@ if (fakeShiftPress) cc->writer()->keyEvent(XK_Shift_L, false); + if(ctrlPressed) + cc->writer()->keyEvent(XK_Control_L, false); break; } case KeyRelease: if (!viewOnly) { + KeySym ks; + char keyname[256]; + XLookupString(&ev->xkey, keyname, 256, &ks, NULL); + if((ks == XK_Control_L) || (ks == XK_Control_L)) + break; + if (downKeysym[ev->xkey.keycode]) { cc->writer()->keyEvent(downKeysym[ev->xkey.keycode], false); downKeysym[ev->xkey.keycode] = 0; ++++++ vnc-210617.patch ++++++ --- vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx.ipv6 2006-10-13 11:31:37.000000000 +0100 +++ vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx 2006-10-13 12:05:40.000000000 +0100 @@ -106,11 +106,29 @@ TcpSocket::TcpSocket(const char *host, int port) : closeFd(true) { + struct sockaddr_storage addr; + size_t addrlen; + struct addrinfo *hostai; int sock; - // - Create a socket initSockets(); - if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) + + if (getaddrinfo(host, NULL, NULL, &hostai)) { + int e = errorNumber; + throw SocketException("unable to resolve host by name", e); + } + + addrlen = hostai->ai_addrlen; + memset(&addr, 0, sizeof(addr)); + memcpy(&addr, hostai->ai_addr, addrlen); + freeaddrinfo(hostai); + if (addr.ss_family == AF_INET) + ((struct sockaddr_in *)&addr)->sin_port = htons(port); + else if (addr.ss_family == AF_INET6) + ((struct sockaddr_in6 *)&addr)->sin6_port = htons(port); + + // - Create a socket + if ((sock = socket(addr.ss_family, SOCK_STREAM, 0)) < 0) throw SocketException("unable to create socket", errorNumber); #ifndef WIN32 @@ -118,30 +136,9 @@ fcntl(sock, F_SETFD, FD_CLOEXEC); #endif - // - Connect it to something - - // Try processing the host as an IP address - struct sockaddr_in addr; - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = inet_addr(host); - addr.sin_port = htons(port); - if ((int)addr.sin_addr.s_addr == -1) { - // Host was not an IP address - try resolving as DNS name - struct hostent *hostinfo; - hostinfo = gethostbyname(host); - if (hostinfo && hostinfo->h_addr) { - addr.sin_addr.s_addr = ((struct in_addr *)hostinfo->h_addr)->s_addr; - } else { - int e = errorNumber; - closesocket(sock); - throw SocketException("unable to resolve host by name", e); - } - } - // Attempt to connect to the remote host for (;;) { - if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) != 0) { + if (connect(sock, (struct sockaddr *)&addr, addrlen) != 0) { int e = errorNumber; if (e == EINTR) continue; ++++++ vnc-build.patch ++++++ reverted: --- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/Imakefile 2005-03-10 14:51:39.000000000 +0000 +++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/Imakefile 2004-12-01 17:27:58.000000000 +0000 @@ -48,7 +48,7 @@ * Make sure XINPUT, XF86VidTune, etc arent defined for the miinitext.o * used by Xvnc */ +EXT_DEFINES = ExtensionDefines -UXINPUT -UXF86VIDMODE -UXFreeXDGA -UXF86MISC -EXT_DEFINES = ExtensionDefines -UXF86VIDMODE -UXFreeXDGA -UXF86MISC #endif @@ -70,7 +70,7 @@ SpecialCplusplusObjectRule(xvnc,$(ICONFIGFILES) xvnc,$(EXT_DEFINES) $(NO_OPERATOR_NAMES)) LinkSourceFile(miinitext.c,$(SERVERSRC)/mi) +SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES) $(PAN_DEFINES) -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS $(EXT_MODULE_DEFINES) -UXFree86LOADER) -SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES) $(PAN_DEFINES) -DNO_MODULE_EXTS $(EXT_MODULE_DEFINES) -UXFree86LOADER) /* InstallManPage(Xvfb,$(MANDIR)) */ DependTarget() ++++++ vnc-config.patch ++++++ --- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc.config 2006-10-25 12:35:00.000000000 +0200 +++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc 2006-10-25 12:35:24.000000000 +0200 @@ -17,6 +17,7 @@ */ #include <stdio.h> +#include "XserverDesktop.h" extern "C" { #define class c_class @@ -48,7 +49,6 @@ #undef min #include <network/TcpSocket.h> -#include "XserverDesktop.h" #include "vncHooks.h" #include "vncExtInit.h" ++++++ vnc-cookie.patch ++++++ --- vnc-4_1-unixsrc/unix/vncserver.cookie 2005-02-23 12:28:18.000000000 +0000 +++ vnc-4_1-unixsrc/unix/vncserver 2005-03-03 22:04:28.000000000 +0000 @@ -116,18 +116,12 @@ $desktopLog = "$vncUserDir/$host:$displayNumber.log"; unlink($desktopLog); -# Make an X server cookie - use as the seed the sum of the current time, our -# PID and part of the encrypted form of the password. Ideally we'd use -# /dev/urandom, but that's only available on Linux. - -srand(time+$$+unpack("L",`cat $vncUserDir/passwd`)); -$cookie = ""; -for (1..16) { - $cookie .= sprintf("%02x", int(rand(256)) % 256); -} - -system("xauth -f $xauthorityFile add $host:$displayNumber . $cookie"); -system("xauth -f $xauthorityFile add $host/unix:$displayNumber . $cookie"); +# Make an X server cookie - use mcookie +$cookie = `/usr/bin/mcookie`; +open (XAUTH, "|xauth -f $xauthorityFile source -"); +print XAUTH "add $host:$displayNumber . $cookie\n"; +print XAUTH "add $host/unix:$displayNumber . $cookie\n"; +close XAUTH; if ($opt{'-name'}) { $desktopName = $opt{'-name'}; ++++++ vnc-modular-xorg.patch ++++++ --- /var/tmp/diff_new_pack.7Qzfb5/_old 2006-12-11 01:50:43.000000000 +0100 +++ /var/tmp/diff_new_pack.7Qzfb5/_new 2006-12-11 01:50:43.000000000 +0100 @@ -40,7 +40,7 @@ VENDOR_STRING); wellKnownSocketsCreated = true; --- /dev/null 2006-06-13 10:12:45.634275750 -0400 -+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/hw/vnc/Makefile.am 2006-06-13 17:47:02.000000000 -0400 ++++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/hw/vnc/Makefile.am 2006-06-13 17:47:02.000000000 -0400 @@ -0,0 +1,85 @@ +noinst_LTLIBRARIES = libvnccommon.la +libvnccommon_la_SOURCES = \ @@ -127,8 +127,8 @@ + -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ + -DVENDOR_STRING="\"$(VENDOR_STRING)\"" + ---- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/hw/Makefile.am.modular-xorg 2006-01-09 21:30:56.000000000 -0500 -+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/hw/Makefile.am 2006-06-13 17:47:51.000000000 -0400 +--- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/hw/Makefile.am.modular-xorg 2006-01-09 21:30:56.000000000 -0500 ++++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/hw/Makefile.am 2006-06-13 17:47:51.000000000 -0400 @@ -26,6 +26,8 @@ KDRIVE_SUBDIRS = kdrive endif @@ -146,8 +146,8 @@ $(KDRIVE_SUBDIRS) DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl ---- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/configure.ac.modular-xorg 2006-05-22 13:18:49.000000000 -0400 -+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/configure.ac 2006-06-13 17:48:11.000000000 -0400 +--- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/configure.ac.modular-xorg 2006-05-22 13:18:49.000000000 -0400 ++++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/configure.ac 2006-06-13 17:48:11.000000000 -0400 @@ -1720,6 +1720,7 @@ hw/xnest/Makefile hw/xwin/Makefile @@ -156,8 +156,8 @@ hw/kdrive/Makefile hw/kdrive/ati/Makefile hw/kdrive/chips/Makefile ---- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/mi/miinitext.c.modular-xorg 2006-03-11 19:11:34.000000000 -0500 -+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/mi/miinitext.c 2006-06-13 17:47:02.000000000 -0400 +--- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/mi/miinitext.c.modular-xorg 2006-03-11 19:11:34.000000000 -0500 ++++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/mi/miinitext.c 2006-06-13 17:47:02.000000000 -0400 @@ -297,6 +297,9 @@ #ifdef MITMISC extern void MITMiscExtensionInit(INITARGS); ++++++ vnc-newfbsize.patch ++++++ --- vnc-4_1_2-unixsrc/unix/vncviewer/CConn.cxx.newfbsize 2006-07-15 12:24:08.000000000 +0200 +++ vnc-4_1_2-unixsrc/unix/vncviewer/CConn.cxx 2006-07-15 12:23:29.000000000 +0200 @@ -305,6 +305,8 @@ if (encoding != encodingCopyRect) { lastServerEncoding = encoding; } + if (encoding == pseudoEncodingDesktopSize) + setDesktopSize( r.width(), r.height() ); } void CConn::endRect(const Rect& r, unsigned int encoding) ++++++ vnc-nohttpd.patch ++++++ --- vnc-4_1_1-unixsrc/unix/vncserver.nohttpd 2005-08-08 15:51:09.000000000 +0100 +++ vnc-4_1_1-unixsrc/unix/vncserver 2005-08-11 12:13:59.000000000 +0100 @@ -58,6 +58,7 @@ # Check command line options &ParseOptions("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1, + "-nohttpd",0, "-help",0,"-h",0,"--help",0); &Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'}); @@ -78,6 +79,12 @@ if ($opt{'-pixelformat'}) { $pixelformat = $opt{'-pixelformat'}; } +if ($opt{'-nohttpd'}) { + $nohttpd = 1; + } +else { + $nohttpd = 0; +} &CheckGeometryAndDepth(); @@ -137,7 +144,7 @@ $cmd = "Xvnc :$displayNumber"; $cmd .= " -desktop " . &quotedString($desktopName); -$cmd .= " -httpd $vncJavaFiles" if ($vncJavaFiles); +$cmd .= " -httpd $vncJavaFiles" if ($vncJavaFiles && ! $nohttpd); $cmd .= " -auth $xauthorityFile"; $cmd .= " -geometry $geometry" if ($geometry); $cmd .= " -depth $depth" if ($depth); @@ -413,7 +420,7 @@ sub Usage { - die("\nusage: $prog [:<number>] [-name <desktop-name>] [-depth <depth>]\n". + die("\nusage: $prog [:<number>] [-nohttpd] [-name <desktop-name>] [-depth <depth>]\n". " [-geometry <width>x<height>]\n". " [-pixelformat rgbNNN|bgrNNN]\n". " <Xvnc-options>...\n\n". --- vnc-4_1_1-unixsrc/unix/vncserver.man.nohttpd 2005-08-11 12:17:46.000000000 +0100 +++ vnc-4_1_1-unixsrc/unix/vncserver.man 2005-08-11 12:19:35.000000000 +0100 @@ -77,6 +77,11 @@ must be 8 bits deep. .TP +.B \-nohttpd +Do not instruct Xvnc to run a mini-httpd if the VNC Java applet is +found. + +.TP .B \-kill :\fIdisplay#\fP This kills a VNC desktop previously started with vncserver. It does this by killing the Xvnc process, whose process ID is stored in the file ++++++ vnc-null-interface.patch ++++++ --- vnc-4_1_1-unixsrc/unix/xorg-server-1.1.0/os/access.c.null-interface 2005-11-08 07:33:30.000000000 +0100 +++ vnc-4_1_1-unixsrc/unix/xorg-server-1.1.0/os/access.c 2006-05-09 09:36:25.000000000 +0200 @@ -975,12 +975,14 @@ return; } for (ifr = ifap; ifr != NULL; ifr = ifr->ifa_next) { + if (!ifr->ifa_addr) + continue; #ifdef DNETCONN if (ifr->ifa_addr.sa_family == AF_DECnet) continue; #endif /* DNETCONN */ len = sizeof(*(ifr->ifa_addr)); - family = ConvertAddr(ifr->ifa_addr, &len, (pointer *)&addr); + family = ifr->ifa_addr ? ConvertAddr(ifr->ifa_addr, &len, (pointer *)&addr) : -1; if (family == -1 || family == FamilyLocal) continue; #if defined(IPv6) && defined(AF_INET6) ++++++ vnc-ppc64.patch ++++++ --- /var/tmp/diff_new_pack.7Qzfb5/_old 2006-12-11 01:50:43.000000000 +0100 +++ /var/tmp/diff_new_pack.7Qzfb5/_new 2006-12-11 01:50:43.000000000 +0100 @@ -1,11 +1,11 @@ ---- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/hw/xfree86/common/compiler.h.ppc64 2006-05-25 11:08:26.000000000 +0200 -+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/hw/xfree86/common/compiler.h 2006-05-25 11:08:58.000000000 +0200 -@@ -1083,7 +1083,7 @@ - extern volatile unsigned char *ioBase; - +--- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/hw/xfree86/common/compiler.h.ppc64 2006-11-14 16:10:58.000000000 +0100 ++++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/hw/xfree86/common/compiler.h 2006-11-14 16:14:11.000000000 +0100 +@@ -1081,7 +1081,7 @@ #if defined(linux) && defined(__powerpc64__) --# include <asm/memory.h> -+/*# include <asm/memory.h>*/ + # include <linux/version.h> + # if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) +-# include <asm/memory.h> ++/*# include <asm/memory.h>*/ + # endif #endif /* defined(linux) && defined(__powerpc64__) */ #ifndef eieio /* We deal with arch-specific eieio() routines above... */ - # define eieio() __asm__ __volatile__ ("eieio" ::: "memory") ++++++ vnc-render.patch ++++++ unchanged: --- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.render 2005-03-17 09:57:08.000000000 +0000 +++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2005-03-17 10:31:39.000000000 +0000 @@ -135,6 +135,9 @@ static Bool vfbPixmapDepths[33]; static char needswap = 0; static int lastScreen = -1; +#ifdef RENDER +static Bool Render = TRUE; +#endif static bool displaySpecified = false; static bool wellKnownSocketsCreated = false; @@ -226,6 +229,10 @@ VENDOR_STRING); ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); ErrorF("-pixdepths list-of-int support given pixmap depths\n"); +#ifdef RENDER + ErrorF("+/-render turn on/off RENDER extension support" + "(default on)\n"); +#endif ErrorF("-linebias n adjust thin line pixelization\n"); ErrorF("-blackpixel n pixel value for black\n"); ErrorF("-whitepixel n pixel value for white\n"); @@ -322,6 +329,20 @@ return ret; } +#ifdef RENDER + if (strcmp (argv[i], "+render") == 0) /* +render */ + { + Render = TRUE; + return 1; + } + + if (strcmp (argv[i], "-render") == 0) /* -render */ + { + Render = FALSE; + return 1; + } +#endif + if (strcmp (argv[i], "-blackpixel") == 0) /* -blackpixel n */ { Pixel pix; @@ -822,7 +843,12 @@ if (!fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height, dpi, dpi, pvfb->paddedWidth, pvfb->bitsPerPixel)) return FALSE; -#else + +#ifdef RENDER + if (ret && Render) + fbPictureInit(pScreen, 0, 0); +#endif /* RENDER */ +#else /* VNC_USE_FB */ switch (pvfb->bitsPerPixel) { case 1: @@ -943,6 +969,19 @@ vfbPixmapDepths[vfbScreens[i].depth] = TRUE; } +#ifdef RENDER + /* RENDER needs a good set of pixmaps. */ + if (Render) { + vfbPixmapDepths[1] = TRUE; + vfbPixmapDepths[4] = TRUE; + vfbPixmapDepths[8] = TRUE; +/* vfbPixmapDepths[15] = TRUE; */ + vfbPixmapDepths[16] = TRUE; + vfbPixmapDepths[24] = TRUE; + vfbPixmapDepths[32] = TRUE; + } +#endif + for (i = 1; i <= 32; i++) { if (vfbPixmapDepths[i]) unchanged: --- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile.render 2005-03-17 09:57:09.000000000 +0000 +++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile 2005-03-17 09:57:09.000000000 +0000 @@ -13,7 +13,7 @@ OBJS = vncExtInit.o vncHooks.o xf86vncModule.o XserverDesktop.o INCLUDES = -I.. -I../../include -I$(EXTINCSRC) -I$(XINCLUDESRC) \ -I$(FONTINCSRC) -I$(XF86COMSRC) \ - $(VNCINCLUDE) + -I../../render $(VNCINCLUDE) DEFINES = $(STD_DEFINES) -DGC_HAS_COMPOSITE_CLIP -DXFree86LOADER LinkSourceFile(vncExtInit.cc,..) unchanged: --- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile.render 2005-03-17 09:57:09.000000000 +0000 +++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile 2005-03-17 09:57:09.000000000 +0000 @@ -19,7 +19,7 @@ SRCS = vncExtInit.cc vncHooks.cc XserverDesktop.cc OBJS = vncExtInit.o vncHooks.o XserverDesktop.o INCLUDES = -I../include -I$(EXTINCSRC) -I$(XINCLUDESRC) -I$(FONTINCSRC) \ - -I../mfb -I../mi $(VNCINCLUDE) + -I../render $(VNCINCLUDE) #if defined(XFree86Version) && XFree86Version >= 4000 VNCDEFINES = -DGC_HAS_COMPOSITE_CLIP #endif diff -u vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc --- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc 2005-03-17 09:57:09.000000000 +0000 +++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc 2005-03-31 12:43:05.000000000 +0100 @@ -29,6 +29,9 @@ #include "regionstr.h" #include "dixfontstr.h" #include "colormapst.h" +#ifdef RENDER +#include "../../../xorg-server-1.1.1/render/picturestr.h" +#endif #ifdef GC_HAS_COMPOSITE_CLIP #define COMPOSITE_CLIP(gc) ((gc)->pCompositeClip) @@ -74,6 +77,9 @@ StoreColorsProcPtr StoreColors; DisplayCursorProcPtr DisplayCursor; ScreenBlockHandlerProcPtr BlockHandler; +#ifdef RENDER + CompositeProcPtr Composite; +#endif } vncHooksScreenRec, *vncHooksScreenPtr; typedef struct { @@ -104,6 +110,13 @@ static Bool vncHooksDisplayCursor(ScreenPtr pScreen, CursorPtr cursor); static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask); +#ifdef RENDER +static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, + PicturePtr pDst, INT16 xSrc, INT16 ySrc, + INT16 xMask, INT16 yMask, INT16 xDst, INT16 yDst, + CARD16 width, CARD16 height); +#endif + // GC "funcs" @@ -229,6 +242,13 @@ vncHooksScreen->StoreColors = pScreen->StoreColors; vncHooksScreen->DisplayCursor = pScreen->DisplayCursor; vncHooksScreen->BlockHandler = pScreen->BlockHandler; +#ifdef RENDER + PictureScreenPtr ps; + ps = GetPictureScreenIfSet(pScreen); + if (ps) { + vncHooksScreen->Composite = ps->Composite; + } +#endif pScreen->CloseScreen = vncHooksCloseScreen; pScreen->CreateGC = vncHooksCreateGC; @@ -241,6 +261,11 @@ pScreen->StoreColors = vncHooksStoreColors; pScreen->DisplayCursor = vncHooksDisplayCursor; pScreen->BlockHandler = vncHooksBlockHandler; +#ifdef RENDER + if (ps) { + ps->Composite = vncHooksComposite; + } +#endif return TRUE; } @@ -470,6 +495,38 @@ SCREEN_REWRAP(BlockHandler); } +// Composite - needed for RENDER + +#ifdef RENDER +void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, + PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, + INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, + CARD16 height) +{ + ScreenPtr pScreen = pDst->pDrawable->pScreen; + vncHooksScreenPtr vncHooksScreen = \ + ((vncHooksScreenPtr)pScreen->devPrivates[vncHooksScreenIndex].ptr); + BoxRec box; + PictureScreenPtr ps = GetPictureScreen(pScreen); + + if ((xDst >= 0) && (yDst >= 0)) { + box.x1 = pDst->pDrawable->x + xDst; + box.y1 = pDst->pDrawable->y + yDst; + box.x2 = box.x1 + width; + box.y2 = box.y1 + height; + + RegionHelper changed(pScreen, &box, 0); + vncHooksScreen->desktop->add_changed(changed.reg); + } + + ps->Composite = vncHooksScreen->Composite; + (*ps->Composite)(op, pSrc, pMask, pDst, xSrc, ySrc, + xMask, yMask, xDst, yDst, width, height); + ps->Composite = vncHooksComposite; +} + +#endif /* RENDER */ + ///////////////////////////////////////////////////////////////////////////// ++++++ vnc-xclients.patch ++++++ --- vnc-4_1-unixsrc/unix/vncserver.xclients 2005-03-03 23:01:16.000000000 +0000 +++ vnc-4_1-unixsrc/unix/vncserver 2005-03-03 23:02:26.000000000 +0000 @@ -42,6 +42,10 @@ $defaultXStartup = ("#!/bin/sh\n\n". + "# Uncomment the following two lines for normal desktop:\n". + "# unset SESSION_MANAGER\n". + "# exec /etc/X11/xinit/xinitrc\n\n". + "[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup\n". "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n". "xsetroot -solid grey\n". "vncconfig -iconic &\n". ++++++ warning-fix.diff ++++++ --- cfb/cfbteblt8.c.orig 2006-12-08 20:38:53.648155234 +0100 +++ cfb/cfbteblt8.c 2006-12-08 20:42:45.810460788 +0100 @@ -303,7 +303,7 @@ #define StorePixels(o,p) dst[o] = p #define Loop dst += widthDst; #else -#define StorePixels(o,p) *dst++ = (p) +#define StorePixels(o,p) do { *dst = (p); dst++; } while (0) #define Loop dst += widthLeft; #endif ++++++ xorg-server-1.1.0.tar.bz2 -> xorg-server-1.1.1.tar.bz2 ++++++ xorg-x11-Xvnc/xorg-server-1.1.0.tar.bz2 /mounts/work_src_done/STABLE/xorg-x11-Xvnc/xorg-server-1.1.1.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wine
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package wine checked in at Mon Dec 11 01:50:37 CET 2006. -------- --- arch/i386/wine/wine.changes 2006-12-08 16:26:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/wine/wine.changes 2006-12-09 09:04:39.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Dec 9 09:04:18 CET 2006 - meissner(a)suse.de + +- removed labels.patch +- Upgraded to upstream 0.9.27: + - Better support for noexec kernels. + - Better Dwarf support in dbghelp. + - Several Winsock fixes. + - Various code cleanups. + - Lots of bug fixes. + +------------------------------------------------------------------- Old: ---- labels.patch wine-0.9.26.tar.bz2 New: ---- wine-0.9.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.JdYKMm/_old 2006-12-11 01:48:48.000000000 +0100 +++ /var/tmp/diff_new_pack.JdYKMm/_new 2006-12-11 01:48:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package wine (Version 0.9.26) +# spec file for package wine (Version 0.9.27) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,12 +15,11 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), Other License(s), see package Group: System/Emulators/PC Autoreqprov: on -Version: 0.9.26 +Version: 0.9.27 Release: 1 Summary: An MS Windows Emulator URL: http://www.winehq.com Source0: wine-%version.tar.bz2 -Patch0: labels.patch Source3: README.SuSE Source4: wine.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -54,7 +53,6 @@ %prep %setup -q -%patch0 -p1 # cp %{S:3} . # @@ -103,6 +101,14 @@ /usr/share/aclocal/wine.m4 %changelog -n wine +* Sat Dec 09 2006 - meissner(a)suse.de +- removed labels.patch +- Upgraded to upstream 0.9.27: + - Better support for noexec kernels. + - Better Dwarf support in dbghelp. + - Several Winsock fixes. + - Various code cleanups. + - Lots of bug fixes. * Fri Dec 08 2006 - meissner(a)suse.de - Upgraded to upstream 0.9.26: - Better support for Unix locale settings. ++++++ wine-0.9.26.tar.bz2 -> wine-0.9.27.tar.bz2 ++++++ arch/i386/wine/wine-0.9.26.tar.bz2 /mounts/work_src_done/STABLE/wine/wine-0.9.27.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package xorg-x11 checked in at Mon Dec 11 01:50:35 CET 2006. -------- --- xorg-x11/xorg-x11.changes 2006-12-06 00:20:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2006-12-08 18:41:38.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 8 18:41:29 CET 2006 - sndirsch(a)suse.de + +- fixed warning in xedit + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.5sLOGl/_old 2006-12-11 01:48:28.000000000 +0100 +++ /var/tmp/diff_new_pack.5sLOGl/_new 2006-12-11 01:48:28.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: fontconfig-devel freetype2-devel libpng-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 26 +Release: 27 License: X11/MIT, Other License(s), see package BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -440,6 +440,8 @@ /var/lib/xdm/authdir/ %changelog -n xorg-x11 +* Fri Dec 08 2006 - sndirsch(a)suse.de +- fixed warning in xedit * Wed Dec 06 2006 - sndirsch(a)suse.de - removed /usr/%%{_lib}/X11/xdm/libXdmGreet.a, /usr/%%{_lib}/X11/xdm/libXdmGreet.la (Bug #223734) ++++++ xedit.diff ++++++ --- /var/tmp/diff_new_pack.5sLOGl/_old 2006-12-11 01:48:41.000000000 +0100 +++ /var/tmp/diff_new_pack.5sLOGl/_new 2006-12-11 01:48:41.000000000 +0100 @@ -20,3 +20,17 @@ break; } if (sscanf(buf, "%ld,%ld:", &so, &eo) != 2) { +--- lisp/core.c.orig 2006-12-08 18:37:54.738159108 +0100 ++++ lisp/core.c 2006-12-08 18:39:53.039027755 +0100 +@@ -116,9 +116,9 @@ extern void unsetenv(const char *name); + predicate == Oeq ? FEQ : \ + predicate == Oequalp ? FEQUALP : 0 + #define FCOMPARE(predicate, left, right, code) \ +- code == FEQ ? left == right : \ ++ (code == FEQ ? left == right : \ + code ? LispObjectCompare(left, right, code) != NIL : \ +- APPLY2(predicate, left, right) != NIL ++ APPLY2(predicate, left, right) != NIL) + + #define FUNCTION_CHECK(predicate) \ + if (FUNCTIONP(predicate)) \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xine-lib
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package xine-lib checked in at Mon Dec 11 01:48:20 CET 2006. -------- --- xine-lib/xine-lib.changes 2006-11-30 12:13:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/xine-lib/xine-lib.changes 2006-12-08 17:39:43.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 8 16:06:45 CET 2006 - mhopf(a)suse.de + +- Update to xine-lib 1.1.3 +- Fixed several strncat() and dubious postincrements. + +------------------------------------------------------------------- Old: ---- vdr-xine-lib-0.7.9-adapted-1.1.2.diff xine-lib-1.1.2.tar.bz2 xine-lib-AUTOMAKE.diff xine-lib-buildfixed-COMMITTED.diff xine-lib-configure.diff xine-lib-cve-2006-4799.diff xine-lib-makefile-cflags.diff xine-lib-mms-fixes-COMMITTED.diff xine-lib-sf-1603458-COMMITTED.diff New: ---- vdr-xine-lib-0.7.9-adapted-1.1.3.diff xine-lib-1.1.3.tar.gz xine-lib-cflags-AUTOMAKE.diff xine-lib-fix-postinc-COMMITTED.diff xine-lib-fix-strncat-COMMITTED.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xine-lib.spec ++++++ --- /var/tmp/diff_new_pack.2f9x7I/_old 2006-12-11 01:48:03.000000000 +0100 +++ /var/tmp/diff_new_pack.2f9x7I/_new 2006-12-11 01:48:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xine-lib (Version 1.1.2) +# spec file for package xine-lib (Version 1.1.3) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,32 +14,25 @@ BuildRequires: ImageMagick-devel SDL-devel arts-devel cdparanoia curl-devel esound-devel flac-devel giflib-devel glib2-devel gnome-common gnome-mime-data gnome-vfs2-devel gnutls-devel gtk2-devel imlib2-devel krb5-devel libdrm-devel libmng-devel libsmbclient libsmbclient-devel libtheora-devel libvorbis-devel lirc mad-devel readline-devel speex-devel update-desktop-files vcdimager-devel %define DISTRIBUTABLE 1 Summary: Video Player with Plug-Ins -Version: 1.1.2 -Release: 39 +Version: 1.1.3 +Release: 1 License: GNU General Public License (GPL), Other License(s), see package Group: Productivity/Multimedia/Video/Players URL: http://xine.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: xine-lib-%version.tar.bz2 +Source: xine-lib-%version.tar.gz Source10: README.SuSE Source11: caramel.tar.bz2 Source12: CelomaChrome.tar.bz2 Source13: lcd.tar.bz2 # *** xine-lib: Bugfixes Patch: xine-lib-various.diff -Patch1: xine-lib-makefile-cflags.diff -# nuke socklen_t autoconf, because it breaks e.g. on 10.1 ppc64 -Patch4: xine-lib-configure.diff -#Patch19: xine-lib-used-constants.diff -Patch22: xine-lib-cve-2006-4799.diff -Patch23: xine-lib-sf-1603458-COMMITTED.diff -Patch24: xine-lib-mms-fixes-COMMITTED.diff -Patch25: xine-lib-buildfixed-COMMITTED.diff +Patch20: xine-lib-fix-postinc-COMMITTED.diff +Patch21: xine-lib-fix-strncat-COMMITTED.diff Patch26: xine-lib-doc-fix-X11R6.diff -Patch40: xine-lib-AUTOMAKE.diff +Patch40: xine-lib-cflags-AUTOMAKE.diff # *** Addons -# changes mutexes all over the place, could be broken ... #? -Patch50: vdr-xine-lib-0.7.9-adapted-1.1.2.diff +Patch50: vdr-xine-lib-0.7.9-adapted-1.1.3.diff Patch51: vdr-xine-fifodir.diff Patch60: vdr-xine-AUTOMAKE.diff # *** SUSE only changes @@ -140,12 +133,8 @@ %prep %setup -q %patch -%patch1 -%patch4 -%patch22 -%patch23 -p1 -%patch24 -%patch25 +%patch20 +%patch21 %patch26 %patch40 %patch50 @@ -177,10 +166,10 @@ # these plugins do not have legal problems # xineplug_ao_out_alsa -xineplug_ao_out_oss +xineplug_ao_out_file xineplug_ao_out_none +xineplug_ao_out_oss xineplug_vo_out_fb -xineplug_ao_out_file xineplug_vo_out_none xineplug_vo_out_opengl xineplug_vo_out_xshm @@ -302,9 +291,11 @@ # xineplug_ao_out_arts xineplug_ao_out_esd -xineplug_inp_gnome_vfs -xineplug_vo_out_sdl +xineplug_ao_out_jack xineplug_vo_out_aa +xineplug_vo_out_sdl +xineplug_vo_out_syncfb +xineplug_inp_gnome_vfs # requires ImageMagick xineplug_decode_image # @@ -394,6 +385,9 @@ /usr/include/xine.h %changelog -n xine-lib +* Fri Dec 08 2006 - mhopf(a)suse.de +- Update to xine-lib 1.1.3 +- Fixed several strncat() and dubious postincrements. * Thu Nov 30 2006 - mhopf(a)suse.de - Security fix for #224813: Potential buffer overflow for real media. SF tracker #1603458: ++++++ vdr-xine-AUTOMAKE.diff ++++++ --- /var/tmp/diff_new_pack.2f9x7I/_old 2006-12-11 01:48:04.000000000 +0100 +++ /var/tmp/diff_new_pack.2f9x7I/_new 2006-12-11 01:48:04.000000000 +0100 @@ -1,7 +1,24 @@ -diff -urpN ../xine-lib-1.1.2-orig/configure ./configure ---- ../xine-lib-1.1.2-orig/configure 2006-10-12 18:16:22.000000000 +0200 -+++ ./configure 2006-10-12 18:43:30.000000000 +0200 -@@ -51641,7 +51642,7 @@ echo " - file - net" +diff -urpwN ../xine-lib-1.1.3-orig/configure ./configure +--- ../xine-lib-1.1.3-orig/configure 2006-12-03 20:41:27.000000000 +0100 ++++ ./configure 2006-12-08 15:05:46.000000000 +0100 +@@ -48388,7 +52921,7 @@ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6 + CFLAGS="$CFLAGS $wsa" + + +- ac_config_files="$ac_config_files Make file doc/Makefile doc/man/Makefile doc/man/en/Makefile doc/hackersguide/Makefile doc/faq/Makefile include/Makefile include/xine.h lib/Makefile m4/Makefile misc/Makefile misc/SlackBuild misc/build_rpms.sh misc/fonts/Makefile misc/libxine.pc misc/relchk.sh misc/xine-config misc/xine-lib.spec po/Makefile.in src/Makefile src/audio_out/Makefile src/demuxers/Makefile src/dxr3/Makefile src/input/Makefile src/input/libdvdnav/Makefile src/input/dvb/Makefile src/input/librtsp/Makefile src/input/libreal/Makefile src/input/vcd/Makefile src/input/vcd/libcdio/Makefile src/input/vcd/libcdio/cdio/Makefile src/input/vcd/libcdio/MSWindows/Makefile src/input/vcd/libcdio/image/Makefile src/input/vcd/libvcd/Makefile src/input/vcd/libvcd/libvcd/Makefile src/liba52/Makefile src/libdts/Makefile src/libfaad/Makefile src/libfaad/codebook/Makefile src/libffmpeg/Makefile src/libffmpeg/libavcodec/Makefile src/libffmpeg/libavcodec/armv4l/Makefile src/libffmpeg/libavcodec/i386/Makefile src/libffmpeg/libav codec/mlib/Makefile src/libffmpeg/libavcodec/alpha/Makefile src/libffmpeg/libavcodec/ppc/Makefile src/libffmpeg/libavcodec/sparc/Makefile src/libffmpeg/libavcodec/libpostproc/Makefile src/libffmpeg/libavutil/Makefile src/libflac/Makefile src/liblpcm/Makefile src/libmad/Makefile src/libmpeg2/Makefile src/libmusepack/Makefile src/libmusepack/musepack/Makefile src/libspudec/Makefile src/libspucc/Makefile src/libspucmml/Makefile src/libspudvb/Makefile src/libsputext/Makefile src/libvorbis/Makefile src/libtheora/Makefile src/libspeex/Makefile src/libw32dll/Makefile src/libw32dll/wine/Makefile src/libw32dll/DirectShow/Makefile src/libw32dll/dmo/Makefile src/libw32dll/qtx/Makefile src/libw32dll/qtx/qtxsdk/Makefile src/libxinevdec/Makefile src/libxineadec/Makefile src/libxineadec/gsm610/Makefile src/libxineadec/nosefart/Makefile src/libreal/Makefile src/post/Makefile src/post/planar/Makefile src/post/goom/Makefile src/post/mosaico/Makefile src/post/visualizations/Makefile src/post/a udio/Makefile src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile src/video_out/Makefile src/video_out/libdha/Makefile src/video_out/libdha/bin/Makefile src/video_out/libdha/kernelhelper/Makefile src/video_out/libdha/oth/Makefile src/video_out/libdha/sysdep/Makefile src/video_out/macosx/Makefile src/video_out/vidix/Makefile src/video_out/vidix/drivers/Makefile src/xine-utils/Makefile src/xine-engine/Makefile win32/Makefile win32/include/Makefile" ++ac_config_files="$ac_config_files Makefile doc/Makefile doc/man/Makefile doc/man/en/Makefile doc/hackersguide/Makefile doc/faq/Makefile include/Makefile include/xine.h lib/Makefile m4/Makefile misc/Makefile misc/SlackBuild misc/build_rpms.sh misc/fonts/Makefile misc/libxine.pc misc/relchk.sh misc/xine-config misc/xine-lib.spec po/Makefile.in src/Makefile src/audio_out/Makefile src/demuxers/Makefile src/dxr3/Makefile src/input/Makefile src/input/libdvdnav/Makefile src/input/dvb/Makefile src/input/librtsp/Makefile src/input/libreal/Makefile src/input/vcd/Makefile src/input/vcd/libcdio/Makefile src/input/vcd/libcdio/cdio/Makefile src/input/vcd/libcdio/MSWindows/Makefile src/input/vcd/libcdio/image/Makefile src/input/vcd/libvcd/Makefile src/input/vcd/libvcd/libvcd/Makefile src/liba52/Makefile src/libdts/Makefile src/libfaad/Makefile src/libfaad/codebook/Makefile src/libffmpeg/Makefile src/libffmpeg/libavcodec/Makefile src/libffmpeg/libavcodec/armv4l/Makefile src/libffmpeg/libav codec/i386/Makefile src/libffmpeg/libavcodec/mlib/Makefile src/libffmpeg/libavcodec/alpha/Makefile src/libffmpeg/libavcodec/ppc/Makefile src/libffmpeg/libavcodec/sparc/Makefile src/libffmpeg/libavcodec/libpostproc/Makefile src/libffmpeg/libavutil/Makefile src/libflac/Makefile src/liblpcm/Makefile src/libmad/Makefile src/libmpeg2/Makefile src/libmusepack/Makefile src/libmusepack/musepack/Makefile src/libspudec/Makefile src/libspucc/Makefile src/libspucmml/Makefile src/libspudvb/Makefile src/libsputext/Makefile src/libvorbis/Makefile src/libtheora/Makefile src/libspeex/Makefile src/libw32dll/Makefile src/libw32dll/wine/Makefile src/libw32dll/DirectShow/Makefile src/libw32dll/dmo/Makefile src/libw32dll/qtx/Makefile src/libw32dll/qtx/qtxsdk/Makefile src/libxinevdec/Makefile src/libxineadec/Makefile src/libxineadec/gsm610/Makefile src/libxineadec/nosefart/Makefile src/libreal/Makefile src/post/Makefile src/post/planar/Makefile src/post/goom/Makefile src/post/mosaico/Makefile src/ post/visualizations/Makefile src/post/audio/Makefile src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile src/video_out/Makefile src/video_out/libdha/Makefile src/video_out/libdha/bin/Makefile src/video_out/libdha/kernelhelper/Makefile src/video_out/libdha/oth/Makefile src/video_out/libdha/sysdep/Makefile src/video_out/macosx/Makefile src/video_out/vidix/Makefile src/video_out/vidix/drivers/Makefile src/xine-utils/Makefile src/xine-engine/Makefile src/vdr/Makefile win32/Makefile win32/include/Makefile" + + ac_config_commands="$ac_config_commands default" + +@@ -49546,6 +54093,7 @@ do + "src/video_out/vidix/drivers/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video_out/vidix/drivers/Makefile" ;; + "src/xine-utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/xine-utils/Makefile" ;; + "src/xine-engine/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/xine-engine/Makefile" ;; ++ "src/vdr/Makefile") CONFIG_FILES="$CONFIG_FILES src/vdr/Makefile" ;; + "win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;; + "win32/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/include/Makefile" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; +@@ -50874,7 +55467,7 @@ echo " - file - net" echo " - stdin_fifo - rtp" echo " - http - mms" echo " - pnm - rtsp" @@ -10,7 +27,7 @@ if test x"$external_dvdnav" = "xyes"; then echo " - dvd (external libs)" else -@@ -51819,6 +51820,7 @@ echo " - invert - expand" +@@ -51052,6 +55645,7 @@ echo " - invert - expand" echo " - eq - eq2" echo " - boxblur - denoise3d" echo " - unsharp - tvtime" @@ -18,10 +35,10 @@ echo " * SFX:" echo " - goom - oscope" echo " - fftscope - mosaico" -diff -urpN ../xine-lib-1.1.2-orig/src/Makefile.in ./src/Makefile.in ---- ../xine-lib-1.1.2-orig/src/Makefile.in 2006-10-12 18:15:52.000000000 +0200 -+++ ./src/Makefile.in 2006-10-12 18:43:00.000000000 +0200 -@@ -545,7 +545,8 @@ SUBDIRS = \ +diff -urpwN ../xine-lib-1.1.3-orig/src/Makefile.in ./src/Makefile.in +--- ../xine-lib-1.1.3-orig/src/Makefile.in 2006-12-03 20:40:25.000000000 +0100 ++++ ./src/Makefile.in 2006-12-08 14:20:55.000000000 +0100 +@@ -524,7 +521,8 @@ SUBDIRS = \ libfaad \ libflac \ libmusepack \ @@ -31,10 +48,10 @@ all: all-recursive -diff -urpN ../xine-lib-1.1.2-orig/src/vdr/Makefile.in ./src/vdr/Makefile.in ---- ../xine-lib-1.1.2-orig/src/vdr/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/Makefile.in 2006-10-12 18:43:23.000000000 +0200 -@@ -0,0 +1,940 @@ +diff -urpwN ../xine-lib-1.1.3-orig/src/vdr/Makefile.in ./src/vdr/Makefile.in +--- ../xine-lib-1.1.3-orig/src/vdr/Makefile.in 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/Makefile.in 2006-12-08 14:21:19.000000000 +0100 +@@ -0,0 +1,916 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + @@ -74,29 +91,24 @@ +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ -+target_triplet = @target@ +DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/misc/Makefile.common +subdir = src/vdr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \ -+ $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/arts.m4 \ -+ $(top_srcdir)/m4/as.m4 $(top_srcdir)/m4/caca.m4 \ -+ $(top_srcdir)/m4/directx.m4 $(top_srcdir)/m4/dl.m4 \ -+ $(top_srcdir)/m4/dvdnav.m4 $(top_srcdir)/m4/esd.m4 \ -+ $(top_srcdir)/m4/ffmpeg.m4 $(top_srcdir)/m4/freetype2.m4 \ ++ $(top_srcdir)/m4/arts.m4 $(top_srcdir)/m4/as.m4 \ ++ $(top_srcdir)/m4/attributes.m4 $(top_srcdir)/m4/directx.m4 \ ++ $(top_srcdir)/m4/dl.m4 $(top_srcdir)/m4/dvdnav.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ -+ $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/lib-ld.m4 \ -+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ -+ $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \ -+ $(top_srcdir)/m4/libtool15.m4 $(top_srcdir)/m4/nls.m4 \ -+ $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/opengl.m4 \ ++ $(top_srcdir)/m4/irixal.m4 $(top_srcdir)/m4/isc-posix.m4 \ ++ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ ++ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libFLAC.m4 \ ++ $(top_srcdir)/m4/libfame.m4 $(top_srcdir)/m4/libtool15.m4 \ ++ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/opengl.m4 \ + $(top_srcdir)/m4/optimizations.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -+ $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/theora.m4 \ -+ $(top_srcdir)/m4/vorbis.m4 $(top_srcdir)/m4/xv.m4 \ -+ $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/xv.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d @@ -151,7 +163,6 @@ +ACLOCAL_DIR = @ACLOCAL_DIR@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ -+ALSA_STATIC_LIB = @ALSA_STATIC_LIB@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ @@ -174,7 +185,6 @@ +BUILD_FAAD_FALSE = @BUILD_FAAD_FALSE@ +BUILD_FAAD_TRUE = @BUILD_FAAD_TRUE@ +CACA_CFLAGS = @CACA_CFLAGS@ -+CACA_CONFIG = @CACA_CONFIG@ +CACA_LIBS = @CACA_LIBS@ +CC = @CC@ +CCAS = @CCAS@ @@ -216,7 +226,6 @@ +ENABLE_VIS_FALSE = @ENABLE_VIS_FALSE@ +ENABLE_VIS_TRUE = @ENABLE_VIS_TRUE@ +ESD_CFLAGS = @ESD_CFLAGS@ -+ESD_CONFIG = @ESD_CONFIG@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +EXTERNAL_A52DEC_FALSE = @EXTERNAL_A52DEC_FALSE@ @@ -227,14 +236,13 @@ +EXTERNAL_LIBMAD_TRUE = @EXTERNAL_LIBMAD_TRUE@ +EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@ +EXTRA_X_LIBS = @EXTRA_X_LIBS@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+FFMPEG_CPPFLAGS = @FFMPEG_CPPFLAGS@ -+FFMPEG_LDFLAGS = @FFMPEG_LDFLAGS@ ++FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ +FFMPEG_LIBS = @FFMPEG_LIBS@ ++FFMPEG_POSTPROC_CFLAGS = @FFMPEG_POSTPROC_CFLAGS@ +FFMPEG_POSTPROC_LIBS = @FFMPEG_POSTPROC_LIBS@ +FIG2DEV = @FIG2DEV@ -+FREETYPE_CONFIG = @FREETYPE_CONFIG@ ++FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ ++FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ +FT2_CFLAGS = @FT2_CFLAGS@ +FT2_LIBS = @FT2_LIBS@ +FUSIONSOUND_CFLAGS = @FUSIONSOUND_CFLAGS@ @@ -248,10 +256,9 @@ +GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@ +GNOME_VFS_LIBS = @GNOME_VFS_LIBS@ +GOOM_LIBS = @GOOM_LIBS@ ++GREP = @GREP@ +HAVE_AA_FALSE = @HAVE_AA_FALSE@ +HAVE_AA_TRUE = @HAVE_AA_TRUE@ -+HAVE_ALSA09_FALSE = @HAVE_ALSA09_FALSE@ -+HAVE_ALSA09_TRUE = @HAVE_ALSA09_TRUE@ +HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@ +HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@ +HAVE_ARMV4L_FALSE = @HAVE_ARMV4L_FALSE@ @@ -295,6 +302,9 @@ +HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ +HAVE_IRIXAL_FALSE = @HAVE_IRIXAL_FALSE@ +HAVE_IRIXAL_TRUE = @HAVE_IRIXAL_TRUE@ ++HAVE_JACK = @HAVE_JACK@ ++HAVE_JACK_FALSE = @HAVE_JACK_FALSE@ ++HAVE_JACK_TRUE = @HAVE_JACK_TRUE@ +HAVE_LIBFAME_FALSE = @HAVE_LIBFAME_FALSE@ +HAVE_LIBFAME_TRUE = @HAVE_LIBFAME_TRUE@ +HAVE_LIBMNG_FALSE = @HAVE_LIBMNG_FALSE@ @@ -314,8 +324,8 @@ +HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@ +HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ +HAVE_OSS_TRUE = @HAVE_OSS_TRUE@ -+HAVE_POLYPAUDIO_FALSE = @HAVE_POLYPAUDIO_FALSE@ -+HAVE_POLYPAUDIO_TRUE = @HAVE_POLYPAUDIO_TRUE@ ++HAVE_PULSEAUDIO_FALSE = @HAVE_PULSEAUDIO_FALSE@ ++HAVE_PULSEAUDIO_TRUE = @HAVE_PULSEAUDIO_TRUE@ +HAVE_SDL_FALSE = @HAVE_SDL_FALSE@ +HAVE_SDL_TRUE = @HAVE_SDL_TRUE@ +HAVE_SGMLTOOLS_FALSE = @HAVE_SGMLTOOLS_FALSE@ @@ -373,6 +383,8 @@ +IRIXAL_CFLAGS = @IRIXAL_CFLAGS@ +IRIXAL_LIBS = @IRIXAL_LIBS@ +IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@ ++JACK_CFLAGS = @JACK_CFLAGS@ ++JACK_LIBS = @JACK_LIBS@ +KSTAT_LIBS = @KSTAT_LIBS@ +LDFLAGS = @LDFLAGS@ +LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@ @@ -399,7 +411,7 @@ +LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@ +LIBSTK_CFLAGS = @LIBSTK_CFLAGS@ +LIBSTK_LIBS = @LIBSTK_LIBS@ -+LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic ++LIBTOOL = $(SHELL) $(top_builddir)/libtool +LIBTOOL_DEPS = @LIBTOOL_DEPS@ +LIBVCDINFO_LIBS = @LIBVCDINFO_LIBS@ +LIBVCD_CFLAGS = @LIBVCD_CFLAGS@ @@ -427,8 +439,6 @@ +OBJCFLAGS = @OBJCFLAGS@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ -+OGG_CFLAGS = @OGG_CFLAGS@ -+OGG_LIBS = @OGG_LIBS@ +OPENGL_CFLAGS = @OPENGL_CFLAGS@ +OPENGL_LIBS = @OPENGL_LIBS@ +PACKAGE = @PACKAGE@ @@ -441,15 +451,14 @@ +PASS2_CFLAGS = @PASS2_CFLAGS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ -+POLYPAUDIO_CFLAGS = @POLYPAUDIO_CFLAGS@ -+POLYPAUDIO_LIBS = @POLYPAUDIO_LIBS@ +POSUB = @POSUB@ +PPC_ARCH_FALSE = @PPC_ARCH_FALSE@ +PPC_ARCH_TRUE = @PPC_ARCH_TRUE@ ++PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ ++PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ +RANLIB = @RANLIB@ +RT_LIBS = @RT_LIBS@ +SDL_CFLAGS = @SDL_CFLAGS@ -+SDL_CONFIG = @SDL_CONFIG@ +SDL_LIBS = @SDL_LIBS@ +SET_MAKE = @SET_MAKE@ +SGMLTOOLS = @SGMLTOOLS@ @@ -462,29 +471,27 @@ +SUNDGA_CFLAGS = @SUNDGA_CFLAGS@ +SUNDGA_LIBS = @SUNDGA_LIBS@ +TAR_NAME = @TAR_NAME@ -+THEORAENC_LIBS = @THEORAENC_LIBS@ -+THEORAFILE_LIBS = @THEORAFILE_LIBS@ +THEORA_CFLAGS = @THEORA_CFLAGS@ +THEORA_LIBS = @THEORA_LIBS@ +THREAD_CPPFLAGS = @THREAD_CPPFLAGS@ +THREAD_LIBS = @THREAD_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ -+VORBISENC_LIBS = @VORBISENC_LIBS@ -+VORBISFILE_LIBS = @VORBISFILE_LIBS@ ++VISIBILITY_FLAG = @VISIBILITY_FLAG@ +VORBIS_CFLAGS = @VORBIS_CFLAGS@ +VORBIS_LIBS = @VORBIS_LIBS@ +W32DLL_DEP = @W32DLL_DEP@ +W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@ +WAND_CFLAGS = @WAND_CFLAGS@ -+WAND_CONFIG = @WAND_CONFIG@ -+WAND_CPPFLAGS = @WAND_CPPFLAGS@ -+WAND_LDFLAGS = @WAND_LDFLAGS@ +WAND_LIBS = @WAND_LIBS@ +WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ +WIN32_FALSE = @WIN32_FALSE@ +WIN32_TRUE = @WIN32_TRUE@ ++X11_CFLAGS = @X11_CFLAGS@ ++X11_LIBS = @X11_LIBS@ +XGETTEXT = @XGETTEXT@ ++XINERAMA_CFLAGS = @XINERAMA_CFLAGS@ ++XINERAMA_LIBS = @XINERAMA_LIBS@ +XINE_ACFLAGS = @XINE_ACFLAGS@ +XINE_BIN_AGE = @XINE_BIN_AGE@ +XINE_BUILD_CC = @XINE_BUILD_CC@ @@ -504,38 +511,21 @@ +XINE_MINOR = @XINE_MINOR@ +XINE_PLUGINDIR = @XINE_PLUGINDIR@ +XINE_PLUGINPATH = @XINE_PLUGINPATH@ -+XINE_PLUGIN_MIN_SYMS = @XINE_PLUGIN_MIN_SYMS@ +XINE_SCRIPTPATH = @XINE_SCRIPTPATH@ +XINE_SUB = @XINE_SUB@ -+XVMC_LIB = @XVMC_LIB@ -+XV_LIB = @XV_LIB@ -+XXMC_LIB = @XXMC_LIB@ ++XMKMF = @XMKMF@ ++XVMC_LIBS = @XVMC_LIBS@ ++XV_CFLAGS = @XV_CFLAGS@ ++XV_LIBS = @XV_LIBS@ ++XXMC_LIBS = @XXMC_LIBS@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_AS = @ac_ct_AS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+ac_pt_AAINFO = @ac_pt_AAINFO@ -+ac_pt_AALIB_CONFIG = @ac_pt_AALIB_CONFIG@ -+ac_pt_ARTS_CONFIG = @ac_pt_ARTS_CONFIG@ -+ac_pt_CACA_CONFIG = @ac_pt_CACA_CONFIG@ -+ac_pt_DVDNAV_CONFIG = @ac_pt_DVDNAV_CONFIG@ -+ac_pt_ESD_CONFIG = @ac_pt_ESD_CONFIG@ -+ac_pt_FREETYPE_CONFIG = @ac_pt_FREETYPE_CONFIG@ -+ac_pt_LIBFAME_CONFIG = @ac_pt_LIBFAME_CONFIG@ -+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -+ac_pt_SDL_CONFIG = @ac_pt_SDL_CONFIG@ -+ac_pt_WAND_CONFIG = @ac_pt_WAND_CONFIG@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -554,31 +544,34 @@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ ++htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = $(XINE_PLUGINDIR) +libexecdir = @libexecdir@ ++localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ ++psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ -+target = @target@ +target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ +w32_path = @w32_path@ +XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la +AM_CFLAGS = -D_LARGEFILE64_SOURCE @@ -975,23 +968,3 @@ +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -diff -urpN ../xine-lib-1.1.2-orig/configure ./configure ---- ../xine-lib-1.1.2-orig/configure 2006-07-09 16:51:14.000000000 +0200 -+++ ./configure 2006-10-12 19:39:46.000000000 +0200 -@@ -54193,7 +54193,7 @@ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6 - CFLAGS="$CFLAGS $wsa" - - --ac_config_files="$ac_config_files Makefile doc/Makefile doc/man/Makefile doc/man/en/Makefile doc/hackersguide/Makefile doc/faq/Makefile include/Makefile include/xine.h lib/Makefile m4/Makefile misc/Makefile misc/SlackBuild misc/build_rpms.sh misc/fonts/Makefile misc/libxine.pc misc/relchk.sh misc/xine-config misc/xine-lib.spec po/Makefile.in src/Makefile src/audio_out/Makefile src/demuxers/Makefile src/dxr3/Makefile src/input/Makefile src/input/libdvdnav/Makefile src/input/dvb/Makefile src/input/librtsp/Makefile src/input/libreal/Makefile src/input/vcd/Makefile src/input/vcd/libcdio/Makefile src/input/vcd/libcdio/cdio/Makefile src/input/vcd/libcdio/MSWindows/Makefile src/input/vcd/libcdio/image/Makefile src/input/vcd/libvcd/Makefile src/input/vcd/libvcd/libvcd/Makefile src/liba52/Makefile src/libdts/Makefile src/libfaad/Makefile src/libfaad/codebook/Makefile src/libffmpeg/Makefile src/libffmpeg/libavcodec/Makefile src/libffmpeg/libavcodec/armv4l/Makefile src/libffmpeg/libav codec/i386/Makefile src/libffmpeg/libavcodec/mlib/Makefile src/libffmpeg/libavcodec/alpha/Makefile src/libffmpeg/libavcodec/ppc/Makefile src/libffmpeg/libavcodec/sparc/Makefile src/libffmpeg/libavcodec/libpostproc/Makefile src/libffmpeg/libavutil/Makefile src/libflac/Makefile src/liblpcm/Makefile src/libmad/Makefile src/libmpeg2/Makefile src/libmusepack/Makefile src/libmusepack/musepack/Makefile src/libspudec/Makefile src/libspucc/Makefile src/libspucmml/Makefile src/libspudvb/Makefile src/libsputext/Makefile src/libvorbis/Makefile src/libtheora/Makefile src/libspeex/Makefile src/libw32dll/Makefile src/libw32dll/wine/Makefile src/libw32dll/DirectShow/Makefile src/libw32dll/dmo/Makefile src/libw32dll/qtx/Makefile src/libw32dll/qtx/qtxsdk/Makefile src/libxinevdec/Makefile src/libxineadec/Makefile src/libxineadec/gsm610/Makefile src/libxineadec/nosefart/Makefile src/libreal/Makefile src/post/Makefile src/post/planar/Makefile src/post/goom/Makefile src/post/mosaico/Makefile src/ post/visualizations/Makefile src/post/audio/Makefile src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile src/video_out/Makefile src/video_out/libdha/Makefile src/video_out/libdha/bin/Makefile src/video_out/libdha/kernelhelper/Makefile src/video_out/libdha/oth/Makefile src/video_out/libdha/sysdep/Makefile src/video_out/macosx/Makefile src/video_out/vidix/Makefile src/video_out/vidix/drivers/Makefile src/xine-utils/Makefile src/xine-engine/Makefile win32/Makefile win32/include/Makefile" -+ac_config_files="$ac_config_files Makefile doc/Makefile doc/man/Makefile doc/man/en/Makefile doc/hackersguide/Makefile doc/faq/Makefile include/Makefile include/xine.h lib/Makefile m4/Makefile misc/Makefile misc/SlackBuild misc/build_rpms.sh misc/fonts/Makefile misc/libxine.pc misc/relchk.sh misc/xine-config misc/xine-lib.spec po/Makefile.in src/Makefile src/audio_out/Makefile src/demuxers/Makefile src/dxr3/Makefile src/input/Makefile src/input/libdvdnav/Makefile src/input/dvb/Makefile src/input/librtsp/Makefile src/input/libreal/Makefile src/input/vcd/Makefile src/input/vcd/libcdio/Makefile src/input/vcd/libcdio/cdio/Makefile src/input/vcd/libcdio/MSWindows/Makefile src/input/vcd/libcdio/image/Makefile src/input/vcd/libvcd/Makefile src/input/vcd/libvcd/libvcd/Makefile src/liba52/Makefile src/libdts/Makefile src/libfaad/Makefile src/libfaad/codebook/Makefile src/libffmpeg/Makefile src/libffmpeg/libavcodec/Makefile src/libffmpeg/libavcodec/armv4l/Makefile src/libffmpeg/libav codec/i386/Makefile src/libffmpeg/libavcodec/mlib/Makefile src/libffmpeg/libavcodec/alpha/Makefile src/libffmpeg/libavcodec/ppc/Makefile src/libffmpeg/libavcodec/sparc/Makefile src/libffmpeg/libavcodec/libpostproc/Makefile src/libffmpeg/libavutil/Makefile src/libflac/Makefile src/liblpcm/Makefile src/libmad/Makefile src/libmpeg2/Makefile src/libmusepack/Makefile src/libmusepack/musepack/Makefile src/libspudec/Makefile src/libspucc/Makefile src/libspucmml/Makefile src/libspudvb/Makefile src/libsputext/Makefile src/libvorbis/Makefile src/libtheora/Makefile src/libspeex/Makefile src/libw32dll/Makefile src/libw32dll/wine/Makefile src/libw32dll/DirectShow/Makefile src/libw32dll/dmo/Makefile src/libw32dll/qtx/Makefile src/libw32dll/qtx/qtxsdk/Makefile src/libxinevdec/Makefile src/libxineadec/Makefile src/libxineadec/gsm610/Makefile src/libxineadec/nosefart/Makefile src/libreal/Makefile src/post/Makefile src/post/planar/Makefile src/post/goom/Makefile src/post/mosaico/Makefile src/ post/visualizations/Makefile src/post/audio/Makefile src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile src/video_out/Makefile src/video_out/libdha/Makefile src/video_out/libdha/bin/Makefile src/video_out/libdha/kernelhelper/Makefile src/video_out/libdha/oth/Makefile src/video_out/libdha/sysdep/Makefile src/video_out/macosx/Makefile src/video_out/vidix/Makefile src/video_out/vidix/drivers/Makefile src/vdr/Makefile src/xine-utils/Makefile src/xine-engine/Makefile win32/Makefile win32/include/Makefile" - - ac_config_commands="$ac_config_commands default" - -@@ -55366,6 +55366,7 @@ do - "src/video_out/macosx/Makefile") CONFIG_FILES="$CONFIG_FILES src/video_out/macosx/Makefile" ;; - "src/video_out/vidix/Makefile") CONFIG_FILES="$CONFIG_FILES src/video_out/vidix/Makefile" ;; - "src/video_out/vidix/drivers/Makefile") CONFIG_FILES="$CONFIG_FILES src/video_out/vidix/drivers/Makefile" ;; -+ "src/vdr/Makefile") CONFIG_FILES="$CONFIG_FILES src/vdr/Makefile" ;; - "src/xine-utils/Makefile") CONFIG_FILES="$CONFIG_FILES src/xine-utils/Makefile" ;; - "src/xine-engine/Makefile") CONFIG_FILES="$CONFIG_FILES src/xine-engine/Makefile" ;; - "win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;; ++++++ vdr-xine-lib-0.7.9-adapted-1.1.2.diff -> vdr-xine-lib-0.7.9-adapted-1.1.3.diff ++++++ --- xine-lib/vdr-xine-lib-0.7.9-adapted-1.1.2.diff 2006-08-11 16:59:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/xine-lib/vdr-xine-lib-0.7.9-adapted-1.1.3.diff 2006-12-08 15:47:33.000000000 +0100 @@ -1,7 +1,7 @@ -diff -Nurp ../xine-lib-1.1.2.orig/configure.ac ./configure.ac ---- ../xine-lib-1.1.2.orig/configure.ac 2006-07-09 16:36:29.000000000 +0200 -+++ ./configure.ac 2006-07-12 19:53:34.000000000 +0200 -@@ -2420,6 +2420,7 @@ src/video_out/vidix/Makefile +diff -urpN ../xine-lib-1.1.3-orig/configure.ac ./configure.ac +--- ../xine-lib-1.1.3-orig/configure.ac 2006-11-05 16:16:56.000000000 +0100 ++++ ./configure.ac 2006-12-08 14:10:11.000000000 +0100 +@@ -2491,6 +2491,7 @@ src/video_out/vidix/Makefile src/video_out/vidix/drivers/Makefile src/xine-utils/Makefile src/xine-engine/Makefile @@ -9,7 +9,7 @@ win32/Makefile win32/include/Makefile]) AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]]) -@@ -2475,7 +2476,7 @@ echo " - file - net" +@@ -2526,7 +2527,7 @@ echo " - file - net" echo " - stdin_fifo - rtp" echo " - http - mms" echo " - pnm - rtsp" @@ -18,7 +18,7 @@ if test x"$external_dvdnav" = "xyes"; then echo " - dvd (external libs)" else -@@ -2658,6 +2659,7 @@ echo " - invert - expand" +@@ -2709,6 +2710,7 @@ echo " - invert - expand" echo " - eq - eq2" echo " - boxblur - denoise3d" echo " - unsharp - tvtime" @@ -26,9 +26,9 @@ echo " * SFX:" echo " - goom - oscope" echo " - fftscope - mosaico" -diff -Nurp ../xine-lib-1.1.2.orig/src/Makefile.am ./src/Makefile.am ---- ../xine-lib-1.1.2.orig/src/Makefile.am 2006-07-09 16:37:12.000000000 +0200 -+++ ./src/Makefile.am 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/Makefile.am ./src/Makefile.am +--- ../xine-lib-1.1.3-orig/src/Makefile.am 2005-01-14 16:24:08.000000000 +0100 ++++ ./src/Makefile.am 2006-12-08 14:10:11.000000000 +0100 @@ -30,4 +30,5 @@ SUBDIRS = \ libfaad \ libflac \ @@ -36,9 +36,9 @@ - post + post \ + vdr -diff -Nurp ../xine-lib-1.1.2.orig/src/libmpeg2/decode.c ./src/libmpeg2/decode.c ---- ../xine-lib-1.1.2.orig/src/libmpeg2/decode.c 2006-07-09 16:39:11.000000000 +0200 -+++ ./src/libmpeg2/decode.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/libmpeg2/decode.c ./src/libmpeg2/decode.c +--- ../xine-lib-1.1.3-orig/src/libmpeg2/decode.c 2006-06-23 20:22:19.000000000 +0200 ++++ ./src/libmpeg2/decode.c 2006-12-08 14:10:11.000000000 +0100 @@ -236,7 +236,7 @@ static void remember_metainfo (mpeg2dec_ } @@ -265,9 +265,9 @@ if (mpeg2dec->force_aspect) picture->aspect_ratio_information = mpeg2dec->force_aspect; if (mpeg2dec->is_sequence_needed) { -diff -Nurp ../xine-lib-1.1.2.orig/src/post/planar/expand.c ./src/post/planar/expand.c ---- ../xine-lib-1.1.2.orig/src/post/planar/expand.c 2006-07-09 16:40:08.000000000 +0200 -+++ ./src/post/planar/expand.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/post/planar/expand.c ./src/post/planar/expand.c +--- ../xine-lib-1.1.3-orig/src/post/planar/expand.c 2006-08-27 18:27:52.000000000 +0200 ++++ ./src/post/planar/expand.c 2006-12-08 14:12:04.000000000 +0100 @@ -21,7 +21,8 @@ * * expand video filter by James Stembridge 24/05/2003 @@ -316,17 +316,7 @@ } post_expand_t; /* plugin class functions */ -@@ -107,6 +118,9 @@ static vo_frame_t *expand_get_frame(x - uint32_t height, double ratio, - int format, int flags); - -+/* replaced vo_frame functions */ -+static int expand_draw(vo_frame_t *frame, xine_stream_t *stream); -+ - /* overlay manager intercept check */ - static int expand_intercept_ovl(post_video_port_t *port); - -@@ -152,11 +166,14 @@ static post_plugin_t *expand_open_plugin +@@ -153,6 +167,8 @@ static post_plugin_t *expand_open_plugin this->enable_automatic_shift = 0; this->overlay_y_offset = 0; this->aspect = 4.0 / 3.0; @@ -335,13 +325,7 @@ port = _x_post_intercept_video_port(&this->post, video_target[0], &input, &output); port->new_port.get_frame = expand_get_frame; - port->intercept_ovl = expand_intercept_ovl; - port->new_manager->add_event = expand_overlay_add_event; -+ port->new_frame->draw = expand_draw; - - input_param = &this->parameter_input; - input_param->name = "parameters"; -@@ -164,8 +181,8 @@ static post_plugin_t *expand_open_plugin +@@ -166,8 +182,8 @@ static post_plugin_t *expand_open_plugin input_param->data = &post_api; xine_list_push_back(this->post.input, input_param); @@ -352,7 +336,7 @@ this->post.xine_post.video_input[0] = &port->new_port; -@@ -212,6 +229,8 @@ static int expand_set_parameters(xine_po +@@ -214,6 +230,8 @@ static int expand_set_parameters(xine_po this->enable_automatic_shift = param->enable_automatic_shift; this->overlay_y_offset = param->overlay_y_offset; this->aspect = param->aspect; @@ -361,7 +345,7 @@ return 1; } -@@ -223,6 +242,8 @@ static int expand_get_parameters(xine_po +@@ -225,6 +243,8 @@ static int expand_get_parameters(xine_po param->enable_automatic_shift = this->enable_automatic_shift; param->overlay_y_offset = this->overlay_y_offset; param->aspect = this->aspect; @@ -370,7 +354,7 @@ return 1; } -@@ -236,6 +257,7 @@ static char *expand_get_help(void) { +@@ -238,25 +258,12 @@ static char *expand_get_help(void) { " Enable_automatic_shift: Enable automatic overlay shifting\n" " Overlay_y_offset: Manually shift the overlay vertically\n" " aspect: The target aspect ratio (default 4:3)\n" @@ -378,7 +362,26 @@ "\n" ); } -@@ -322,6 +344,10 @@ static vo_frame_t *expand_get_frame(xine + + +-static int expand_draw(vo_frame_t *frame, xine_stream_t *stream) +-{ +- post_video_port_t *port = (post_video_port_t *)frame->port; +- post_expand_t *this = (post_expand_t *)port->post; +- int skip; +- +- frame->ratio = this->aspect; +- _x_post_frame_copy_down(frame, frame->next); +- skip = frame->next->draw(frame->next, stream); +- _x_post_frame_copy_up(frame, frame->next); +- return skip; +-} +- +- + static vo_frame_t *expand_get_frame(xine_video_port_t *port_gen, uint32_t width, + uint32_t height, double ratio, + int format, int flags) +@@ -338,6 +359,10 @@ static vo_frame_t *expand_get_frame(xine static int expand_intercept_ovl(post_video_port_t *port) { @@ -389,7 +392,7 @@ /* we always intercept overlay manager */ return 1; } -@@ -350,3 +376,79 @@ static int32_t expand_overlay_add_event( +@@ -366,3 +377,80 @@ static int32_t expand_overlay_add_event( return port->original_manager->add_event(port->original_manager, event_gen); } @@ -430,6 +433,7 @@ + post_expand_t *this = (post_expand_t *)port->post; + int skip; + ++ frame->ratio = this->aspect; + if (this->centre_cut_out_mode && !frame->bad_frame) + { + /* expected area of inner 4:3 image */ @@ -469,9 +473,9 @@ + + return skip; +} -diff -Nurp ../xine-lib-1.1.2.orig/src/vdr/Makefile.am ./src/vdr/Makefile.am ---- ../xine-lib-1.1.2.orig/src/vdr/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/Makefile.am 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/vdr/Makefile.am ./src/vdr/Makefile.am +--- ../xine-lib-1.1.3-orig/src/vdr/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/Makefile.am 2006-12-08 14:10:11.000000000 +0100 @@ -0,0 +1,30 @@ +include $(top_srcdir)/misc/Makefile.common + @@ -503,9 +507,9 @@ + +noinst_HEADERS = post_vdr.h + -diff -Nurp ../xine-lib-1.1.2.orig/src/vdr/input_vdr.c ./src/vdr/input_vdr.c ---- ../xine-lib-1.1.2.orig/src/vdr/input_vdr.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/input_vdr.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/vdr/input_vdr.c ./src/vdr/input_vdr.c +--- ../xine-lib-1.1.3-orig/src/vdr/input_vdr.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/input_vdr.c 2006-12-08 14:10:11.000000000 +0100 @@ -0,0 +1,2480 @@ +/* + * Copyright (C) 2003-2004 the xine project @@ -2987,9 +2991,9 @@ + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; + -diff -Nurp ../xine-lib-1.1.2.orig/src/vdr/input_vdr.h ./src/vdr/input_vdr.h ---- ../xine-lib-1.1.2.orig/src/vdr/input_vdr.h 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/input_vdr.h 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/vdr/input_vdr.h ./src/vdr/input_vdr.h +--- ../xine-lib-1.1.3-orig/src/vdr/input_vdr.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/input_vdr.h 2006-12-08 14:10:11.000000000 +0100 @@ -0,0 +1,585 @@ + +#ifndef __INPUT_VDR_H @@ -3576,9 +3580,9 @@ + +#endif /* __INPUT_VDR_H */ + -diff -Nurp ../xine-lib-1.1.2.orig/src/vdr/post_vdr.c ./src/vdr/post_vdr.c ---- ../xine-lib-1.1.2.orig/src/vdr/post_vdr.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/post_vdr.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/vdr/post_vdr.c ./src/vdr/post_vdr.c +--- ../xine-lib-1.1.3-orig/src/vdr/post_vdr.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/post_vdr.c 2006-12-08 14:10:11.000000000 +0100 @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2000-2004 the xine project @@ -3624,9 +3628,9 @@ + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; + -diff -Nurp ../xine-lib-1.1.2.orig/src/vdr/post_vdr.h ./src/vdr/post_vdr.h ---- ../xine-lib-1.1.2.orig/src/vdr/post_vdr.h 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/post_vdr.h 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/vdr/post_vdr.h ./src/vdr/post_vdr.h +--- ../xine-lib-1.1.3-orig/src/vdr/post_vdr.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/post_vdr.h 2006-12-08 14:10:11.000000000 +0100 @@ -0,0 +1,71 @@ + +#ifndef __POST_VDR_H @@ -3699,9 +3703,9 @@ + +#endif /* __POST_VDR_H */ + -diff -Nurp ../xine-lib-1.1.2.orig/src/vdr/post_vdr_audio.c ./src/vdr/post_vdr_audio.c ---- ../xine-lib-1.1.2.orig/src/vdr/post_vdr_audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/post_vdr_audio.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/vdr/post_vdr_audio.c ./src/vdr/post_vdr_audio.c +--- ../xine-lib-1.1.3-orig/src/vdr/post_vdr_audio.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/post_vdr_audio.c 2006-12-08 14:10:11.000000000 +0100 @@ -0,0 +1,287 @@ +/* + * Copyright (C) 2000-2004 the xine project @@ -3990,9 +3994,9 @@ + + return; +} -diff -Nurp ../xine-lib-1.1.2.orig/src/vdr/post_vdr_video.c ./src/vdr/post_vdr_video.c ---- ../xine-lib-1.1.2.orig/src/vdr/post_vdr_video.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./src/vdr/post_vdr_video.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/vdr/post_vdr_video.c ./src/vdr/post_vdr_video.c +--- ../xine-lib-1.1.3-orig/src/vdr/post_vdr_video.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/vdr/post_vdr_video.c 2006-12-08 14:10:11.000000000 +0100 @@ -0,0 +1,485 @@ +/* + * Copyright (C) 2000-2004 the xine project @@ -4479,10 +4483,10 @@ + + return skip; +} -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/audio_out.c ./src/xine-engine/audio_out.c ---- ../xine-lib-1.1.2.orig/src/xine-engine/audio_out.c 2006-07-09 16:40:08.000000000 +0200 -+++ ./src/xine-engine/audio_out.c 2006-07-12 19:53:34.000000000 +0200 -@@ -1040,6 +1040,10 @@ static void *ao_loop (void *this_gen) { +diff -urpN ../xine-lib-1.1.3-orig/src/xine-engine/audio_out.c ./src/xine-engine/audio_out.c +--- ../xine-lib-1.1.3-orig/src/xine-engine/audio_out.c 2006-11-05 00:30:14.000000000 +0100 ++++ ./src/xine-engine/audio_out.c 2006-12-08 14:10:11.000000000 +0100 +@@ -1026,6 +1026,10 @@ static void *ao_loop (void *this_gen) { in_buf->vpts, cur_time); } @@ -4493,117 +4497,9 @@ lprintf ("loop:pause: I feel sleepy (%d buffers).\n", this->out_fifo->num_buffers); xine_usec_sleep (10000); lprintf ("loop:pause: I wake up.\n"); -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/demux.c ./src/xine-engine/demux.c ---- ../xine-lib-1.1.2.orig/src/xine-engine/demux.c 2006-07-09 16:40:08.000000000 +0200 -+++ ./src/xine-engine/demux.c 2006-07-12 19:53:34.000000000 +0200 -@@ -85,6 +85,8 @@ void _x_demux_flush_engine (xine_stream_ - stream->video_fifo->clear(stream->video_fifo); - stream->audio_fifo->clear(stream->audio_fifo); - -+ pthread_mutex_lock(&stream->demux_mutex); -+ - buf = stream->video_fifo->buffer_pool_alloc (stream->video_fifo); - buf->type = BUF_CONTROL_RESET_DECODER; - stream->video_fifo->put (stream->video_fifo, buf); -@@ -93,6 +95,8 @@ void _x_demux_flush_engine (xine_stream_ - buf->type = BUF_CONTROL_RESET_DECODER; - stream->audio_fifo->put (stream->audio_fifo, buf); - -+ pthread_mutex_unlock(&stream->demux_mutex); -+ - /* on seeking we must wait decoder fifos to process before doing flush. - * otherwise we flush too early (before the old data has left decoders) - */ -@@ -124,6 +128,8 @@ void _x_demux_control_newpts( xine_strea - - buf_element_t *buf; - -+ pthread_mutex_lock(&stream->demux_mutex); -+ - buf = stream->video_fifo->buffer_pool_alloc (stream->video_fifo); - buf->type = BUF_CONTROL_NEWPTS; - buf->decoder_flags = flags; -@@ -135,6 +141,8 @@ void _x_demux_control_newpts( xine_strea - buf->decoder_flags = flags; - buf->disc_off = pts; - stream->audio_fifo->put (stream->audio_fifo, buf); -+ -+ pthread_mutex_unlock(&stream->demux_mutex); - } - - /* sync with decoder fifos, making sure everything gets processed */ -@@ -165,12 +173,16 @@ void _x_demux_control_headers_done (xine - header_count_audio = 0; - } - -+ pthread_mutex_lock(&stream->demux_mutex); -+ - buf_video->type = BUF_CONTROL_HEADERS_DONE; - stream->video_fifo->put (stream->video_fifo, buf_video); - - buf_audio->type = BUF_CONTROL_HEADERS_DONE; - stream->audio_fifo->put (stream->audio_fifo, buf_audio); - -+ pthread_mutex_unlock(&stream->demux_mutex); -+ - while ((stream->header_count_audio < header_count_audio) || - (stream->header_count_video < header_count_video)) { - struct timeval tv; -@@ -198,6 +210,8 @@ void _x_demux_control_start( xine_stream - - buf_element_t *buf; - -+ pthread_mutex_lock(&stream->demux_mutex); -+ - buf = stream->video_fifo->buffer_pool_alloc (stream->video_fifo); - buf->type = BUF_CONTROL_START; - stream->video_fifo->put (stream->video_fifo, buf); -@@ -205,12 +219,16 @@ void _x_demux_control_start( xine_stream - buf = stream->audio_fifo->buffer_pool_alloc (stream->audio_fifo); - buf->type = BUF_CONTROL_START; - stream->audio_fifo->put (stream->audio_fifo, buf); -+ -+ pthread_mutex_unlock(&stream->demux_mutex); - } - - void _x_demux_control_end( xine_stream_t *stream, uint32_t flags ) { - - buf_element_t *buf; - -+ pthread_mutex_lock(&stream->demux_mutex); -+ - buf = stream->video_fifo->buffer_pool_alloc (stream->video_fifo); - buf->type = BUF_CONTROL_END; - buf->decoder_flags = flags; -@@ -220,12 +238,16 @@ void _x_demux_control_end( xine_stream_t - buf->type = BUF_CONTROL_END; - buf->decoder_flags = flags; - stream->audio_fifo->put (stream->audio_fifo, buf); -+ -+ pthread_mutex_unlock(&stream->demux_mutex); - } - - void _x_demux_control_nop( xine_stream_t *stream, uint32_t flags ) { - - buf_element_t *buf; - -+ pthread_mutex_lock(&stream->demux_mutex); -+ - buf = stream->video_fifo->buffer_pool_alloc (stream->video_fifo); - buf->type = BUF_CONTROL_NOP; - buf->decoder_flags = flags; -@@ -235,6 +257,8 @@ void _x_demux_control_nop( xine_stream_t - buf->type = BUF_CONTROL_NOP; - buf->decoder_flags = flags; - stream->audio_fifo->put (stream->audio_fifo, buf); -+ -+ pthread_mutex_unlock(&stream->demux_mutex); - } - - static void *demux_loop (void *stream_gen) { -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/post.c ./src/xine-engine/post.c ---- ../xine-lib-1.1.2.orig/src/xine-engine/post.c 2006-07-09 16:40:08.000000000 +0200 -+++ ./src/xine-engine/post.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/xine-engine/post.c ./src/xine-engine/post.c +--- ../xine-lib-1.1.3-orig/src/xine-engine/post.c 2006-01-27 08:46:15.000000000 +0100 ++++ ./src/xine-engine/post.c 2006-12-08 14:10:20.000000000 +0100 @@ -149,6 +149,14 @@ static void post_video_flush(xine_video_ if (port->port_lock) pthread_mutex_unlock(port->port_lock); } @@ -4627,9 +4523,9 @@ port->new_port.status = post_video_status; port->new_port.get_property = post_video_get_property; port->new_port.set_property = post_video_set_property; -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/video_out.c ./src/xine-engine/video_out.c ---- ../xine-lib-1.1.2.orig/src/xine-engine/video_out.c 2006-03-25 02:26:34.000000000 +0100 -+++ ./src/xine-engine/video_out.c 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/xine-engine/video_out.c ./src/xine-engine/video_out.c +--- ../xine-lib-1.1.3-orig/src/xine-engine/video_out.c 2006-03-25 02:26:34.000000000 +0100 ++++ ./src/xine-engine/video_out.c 2006-12-08 14:10:20.000000000 +0100 @@ -127,6 +127,9 @@ typedef struct { int frame_drop_limit; int frame_drop_cpt; @@ -4755,9 +4651,9 @@ this->frame_drop_limit = 3; this->frame_drop_cpt = 0; -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/video_out.h ./src/xine-engine/video_out.h ---- ../xine-lib-1.1.2.orig/src/xine-engine/video_out.h 2006-07-09 16:40:08.000000000 +0200 -+++ ./src/xine-engine/video_out.h 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/xine-engine/video_out.h ./src/xine-engine/video_out.h +--- ../xine-lib-1.1.3-orig/src/xine-engine/video_out.h 2006-09-26 07:19:49.000000000 +0200 ++++ ./src/xine-engine/video_out.h 2006-12-08 14:10:20.000000000 +0100 @@ -205,6 +205,9 @@ struct xine_video_port_s { /* flush video_out fifo */ void (*flush) (xine_video_port_t *self); @@ -4768,9 +4664,9 @@ /* Get/Set video property * * See VO_PROP_* bellow -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/video_overlay.h ./src/xine-engine/video_overlay.h ---- ../xine-lib-1.1.2.orig/src/xine-engine/video_overlay.h 2006-07-09 16:40:08.000000000 +0200 -+++ ./src/xine-engine/video_overlay.h 2006-07-12 19:53:34.000000000 +0200 +diff -urpN ../xine-lib-1.1.3-orig/src/xine-engine/video_overlay.h ./src/xine-engine/video_overlay.h +--- ../xine-lib-1.1.3-orig/src/xine-engine/video_overlay.h 2006-09-26 07:19:49.000000000 +0200 ++++ ./src/xine-engine/video_overlay.h 2006-12-08 14:10:20.000000000 +0100 @@ -38,7 +38,7 @@ #define MAX_OBJECTS 50 @@ -4780,26 +4676,10 @@ #define OVERLAY_EVENT_NULL 0 #define OVERLAY_EVENT_SHOW 1 -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/xine.c ./src/xine-engine/xine.c ---- ../xine-lib-1.1.2.orig/src/xine-engine/xine.c 2006-07-09 16:40:08.000000000 +0200 -+++ ./src/xine-engine/xine.c 2006-07-12 19:53:34.000000000 +0200 -@@ -533,6 +533,7 @@ xine_stream_t *xine_stream_new (xine_t * - pthread_mutex_init (&stream->info_mutex, NULL); - pthread_mutex_init (&stream->meta_mutex, NULL); - pthread_mutex_init (&stream->demux_lock, NULL); -+ pthread_mutex_init (&stream->demux_mutex, NULL); - pthread_mutex_init (&stream->event_queues_lock, NULL); - pthread_mutex_init (&stream->counter_lock, NULL); - pthread_cond_init (&stream->counter_changed, NULL); -@@ -1270,6 +1271,7 @@ void xine_dispose_internal (xine_stream_ - pthread_mutex_destroy (&stream->event_queues_lock); - pthread_mutex_destroy (&stream->current_extra_info_lock); - pthread_cond_destroy (&stream->counter_changed); -+ pthread_mutex_destroy (&stream->demux_mutex); - pthread_mutex_destroy (&stream->demux_lock); - pthread_mutex_destroy (&stream->first_frame_lock); - pthread_cond_destroy (&stream->first_frame_reached); -@@ -1961,3 +1963,89 @@ int xine_stream_master_slave(xine_stream +diff -urpN ../xine-lib-1.1.3-orig/src/xine-engine/xine.c ./src/xine-engine/xine.c +--- ../xine-lib-1.1.3-orig/src/xine-engine/xine.c 2006-10-17 00:18:24.000000000 +0200 ++++ ./src/xine-engine/xine.c 2006-12-08 14:10:25.000000000 +0100 +@@ -2016,3 +2016,89 @@ int xine_stream_master_slave(xine_stream slave->master = master->master; return 1; } @@ -4889,18 +4769,10 @@ +{ + pthread_mutex_unlock(&stream->frontend_lock); +} -diff -Nurp ../xine-lib-1.1.2.orig/src/xine-engine/xine_internal.h ./src/xine-engine/xine_internal.h ---- ../xine-lib-1.1.2.orig/src/xine-engine/xine_internal.h 2006-04-22 00:46:33.000000000 +0200 -+++ ./src/xine-engine/xine_internal.h 2006-07-12 19:53:34.000000000 +0200 -@@ -320,6 +320,7 @@ struct xine_stream_s { - int demux_thread_running; - pthread_mutex_t demux_lock; - int demux_action_pending; -+ pthread_mutex_t demux_mutex; /* used in _x_demux_... functions to synchronize order of pairwise A/V buffer operations */ - - extra_info_t *current_extra_info; - pthread_mutex_t current_extra_info_lock; -@@ -354,6 +355,15 @@ struct xine_stream_s { +diff -urpN ../xine-lib-1.1.3-orig/src/xine-engine/xine_internal.h ./src/xine-engine/xine_internal.h +--- ../xine-lib-1.1.3-orig/src/xine-engine/xine_internal.h 2006-10-02 17:56:06.000000000 +0200 ++++ ./src/xine-engine/xine_internal.h 2006-12-08 14:14:06.000000000 +0100 +@@ -356,6 +356,15 @@ struct xine_stream_s { * private function prototypes: */ @@ -4913,6 +4785,6 @@ +int _x_lock_frontend(xine_stream_t *stream, int ms_to_time_out); +void _x_unlock_frontend(xine_stream_t *stream); + - void _x_handle_stream_end (xine_stream_t *stream, int non_user); + void _x_handle_stream_end (xine_stream_t *stream, int non_user) XINE_PROTECTED; /* report message to UI. usually these are async errors */ ++++++ xine-lib-cflags-AUTOMAKE.diff ++++++ diff -urp ../xine-lib-1.1.2.orig/src/libffmpeg/libavcodec/i386/Makefile.am ./src/libffmpeg/libavcodec/i386/Makefile.am --- ../xine-lib-1.1.2.orig/src/libffmpeg/libavcodec/i386/Makefile.am 2006-07-09 16:39:01.000000000 +0200 +++ ./src/libffmpeg/libavcodec/i386/Makefile.am 2006-07-12 18:44:33.000000000 +0200 @@ -2,10 +2,9 @@ include $(top_srcdir)/misc/Makefile.comm # -fomit-frame-pointer is always needed. it might cause debug to not # work, but at least it compiles. -AM_CFLAGS = -fomit-frame-pointer -fno-strict-aliasing -# CFLAGS is here to filter out -funroll-loops because it causes bad +# -funroll-loops of @CFLAGS@ are filtered out here because it causes bad # behavior of libavcodec -CFLAGS := `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'` +AM_CFLAGS = -fomit-frame-pointer -fno-strict-aliasing `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'` AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil # Avoid "can't find register" failures with -O1 and higher diff -urp ../xine-lib-1.1.2.orig/src/libw32dll/wine/Makefile.am ./src/libw32dll/wine/Makefile.am --- ../xine-lib-1.1.2.orig/src/libw32dll/wine/Makefile.am 2003-10-02 21:30:30.000000000 +0200 +++ ./src/libw32dll/wine/Makefile.am 2006-07-12 18:54:37.000000000 +0200 @@ -6,15 +6,13 @@ EXTRA_DIST = stubs.s wrapper.S noinst_LTLIBRARIES = $(wine_lib) +# filter out -fomit-frame-pointer, -finline-functions, and -frename-registers +# from @CFLAGS@ here, because they cause bad behavior of wine AM_CFLAGS = $(X_CFLAGS) @W32_NO_OPTIMIZE@ \ -Wmissing-prototypes -Wimplicit-function-declaration \ -DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \ - -Ddbg_printf=__vprintf -DTRACE=__vprintf - -# CFLAGS is here to filter out -fomit-frame-pointer, -# -finline-functions and -frename-registers because they cause bad -# behavior of wine -CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-finline-functions//g;s/-frename-registers//g'` + -Ddbg_printf=__vprintf -DTRACE=__vprintf \ + `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-finline-functions//g;s/-frename-registers//g'` if HAVE_W32DLL wine_lib = libwine.la diff -urp ../xine-lib-1.1.2.orig/src/libffmpeg/libavcodec/i386/Makefile.in ./src/libffmpeg/libavcodec/i386/Makefile.in --- ../xine-lib-1.1.2.orig/src/libffmpeg/libavcodec/i386/Makefile.in 2006-07-09 16:51:15.000000000 +0200 +++ ./src/libffmpeg/libavcodec/i386/Makefile.in 2006-10-11 12:26:58.000000000 +0200 @@ -135,9 +135,7 @@ CCAS = @CCAS@ CCASCOMPILE = @CCASCOMPILE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ -# CFLAGS is here to filter out -funroll-loops because it causes bad -# behavior of libavcodec -CFLAGS := `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'` +CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -532,7 +538,9 @@ XINE_LIB = $(top_builddir)/src/xine-engi # -fomit-frame-pointer is always needed. it might cause debug to not # work, but at least it compiles. -AM_CFLAGS = -fomit-frame-pointer -fno-strict-aliasing +# -funroll-loops of @CFLAGS@ are filtered out here because it causes bad +# behavior of libavcodec +AM_CFLAGS = -fomit-frame-pointer -fno-strict-aliasing `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'` AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil noinst_LTLIBRARIES = libavcodec_mmx.la libavcodec_mmx_src = \ diff -urp ../xine-lib-1.1.2.orig/src/libw32dll/wine/Makefile.in ./src/libw32dll/wine/Makefile.in --- ../xine-lib-1.1.2.orig/src/libw32dll/wine/Makefile.in 2006-07-09 16:51:15.000000000 +0200 +++ ./src/libw32dll/wine/Makefile.in 2006-10-11 12:27:08.000000000 +0200 @@ -130,11 +130,7 @@ CCAS = @CCAS@ CCASCOMPILE = @CCASCOMPILE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ - -# CFLAGS is here to filter out -fomit-frame-pointer, -# -finline-functions and -frename-registers because they cause bad -# behavior of wine -CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-finline-functions//g;s/-frename-registers//g'` +CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -528,10 +532,14 @@ w32_path = @w32_path@ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la EXTRA_DIST = stubs.s wrapper.S noinst_LTLIBRARIES = $(wine_lib) + +# filter out -fomit-frame-pointer, -finline-functions, and -frename-registers +# from @CFLAGS@ here, because they cause bad behavior of wine AM_CFLAGS = $(X_CFLAGS) @W32_NO_OPTIMIZE@ \ -Wmissing-prototypes -Wimplicit-function-declaration \ -DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \ - -Ddbg_printf=__vprintf -DTRACE=__vprintf + -Ddbg_printf=__vprintf -DTRACE=__vprintf \ + `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-finline-functions//g;s/-frename-registers//g'` @HAVE_W32DLL_TRUE@wine_lib = libwine.la libwine_la_SOURCES = \ ++++++ xine-lib-fix-postinc-COMMITTED.diff ++++++ Index: src/demuxers/demux_iff.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_iff.c,v retrieving revision 1.17 diff -u -p -r1.17 demux_iff.c --- src/demuxers/demux_iff.c 10 Jul 2006 22:08:13 -0000 1.17 +++ src/demuxers/demux_iff.c 8 Dec 2006 15:25:40 -0000 @@ -827,7 +827,8 @@ static int demux_iff_send_chunk(demux_pl } } else { for (j = 0, k = (interleave_index / 2); j < (buf->size / 2); j += this->audio_channels) { - zw_16 = BE_16(&pointer16_from[k++]); + zw_16 = BE_16(&pointer16_from[k]); + k++; zw_rescale = zw_16; zw_rescale *= this->audio_volume_left; zw_rescale /= max_volume; @@ -856,7 +857,8 @@ static int demux_iff_send_chunk(demux_pl } } else { for (j = 1; j < (buf->size / 2); j += this->audio_channels) { - zw_16 = BE_16(&pointer16_from[k++]); + zw_16 = BE_16(&pointer16_from[k]); + k++; zw_rescale = zw_16; zw_rescale *= this->audio_volume_left; zw_rescale /= max_volume; ++++++ xine-lib-fix-strncat-COMMITTED.diff ++++++ Index: src/input/input_http.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/input/input_http.c,v retrieving revision 1.124 diff -u -p -r1.124 input_http.c --- src/input/input_http.c 30 Nov 2006 10:54:18 -0000 1.124 +++ src/input/input_http.c 8 Dec 2006 15:59:38 -0000 @@ -335,12 +335,9 @@ static int http_plugin_read_metainf (htt /* prepares the event */ radio = _x_meta_info_get(this->stream, XINE_META_INFO_ALBUM); if (radio) { - int len = strlen(radio); - strncpy(data.str, radio, sizeof(data.str)); - strncat(data.str, " - ", sizeof(data.str) - len); - strncat(data.str, songtitle, sizeof(data.str) - len - 3); + snprintf (data.str, sizeof(data.str), "%s - %s", radio, songtitle); } else { - strncpy(data.str, songtitle, sizeof(data.str)); + strncpy(data.str, songtitle, sizeof(data.str)-1); } data.str[sizeof(data.str) - 1] = '\0'; data.str_len = strlen(data.str) + 1; @@ -766,13 +763,11 @@ static int http_plugin_open (input_plugi } snprintf(this->buf + buflen, BUFSIZE - buflen, - "User-Agent: xine/%s\015\012", VERSION); - buflen = strlen(this->buf); - strncat (this->buf, "Accept: */*\015\012", BUFSIZE - buflen); - buflen = strlen(this->buf); - strncat (this->buf, "Icy-MetaData: 1\015\012", BUFSIZE - buflen); - buflen = strlen(this->buf); - strncat (this->buf, "\015\012", BUFSIZE - buflen); + "User-Agent: xine/%s\015\012" + "Accept: */*\015\012" + "Icy-MetaData: 1\015\012" + "\015\012", + VERSION); buflen = strlen(this->buf); if (_x_io_tcp_write (this->stream, this->fh, this->buf, buflen) != buflen) { _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "couldn't send request", NULL); Index: src/input/libdvdnav/remap.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/input/libdvdnav/remap.c,v retrieving revision 1.5 diff -u -p -r1.5 remap.c --- src/input/libdvdnav/remap.c 17 Sep 2006 13:01:08 -0000 1.5 +++ src/input/libdvdnav/remap.c 8 Dec 2006 15:59:38 -0000 @@ -193,10 +193,7 @@ remap_t* remap_loadmap( char *title) { /* Build the map filename */ home = getenv("HOME"); assert(home); - strncpy(fname, home, sizeof(fname)); - strncat(fname, "/.dvdnav/", sizeof(fname)); - strncat(fname, title, sizeof(fname)); - strncat(fname, ".map", sizeof(fname)); + snprintf (fname, sizeof(fname), "%s/.dvdnav/%s.map", home, title); /* Open the map file */ fp = fopen( fname, "r"); Index: src/input/vcd/libcdio/iso9660_fs.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/input/vcd/libcdio/iso9660_fs.c,v retrieving revision 1.6 diff -u -p -r1.6 iso9660_fs.c --- src/input/vcd/libcdio/iso9660_fs.c 28 Sep 2006 08:19:14 -0000 1.6 +++ src/input/vcd/libcdio/iso9660_fs.c 8 Dec 2006 15:59:38 -0000 @@ -1200,9 +1200,7 @@ find_fs_lsn_recurse (CdIo *p_cdio, const char _fullname[4096] = { 0, }; char *filename = (char *) statbuf->filename; - snprintf (_fullname, sizeof (_fullname), "%s%s", pathname, filename); - - strncat (_fullname, "/", sizeof (_fullname)); + snprintf (_fullname, sizeof (_fullname), "%s%s/", pathname, filename); if (statbuf->type == _STAT_DIR && strcmp ((char *) statbuf->filename, ".") Index: src/input/vcd/libvcd/vcd.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/input/vcd/libvcd/vcd.c,v retrieving revision 1.3 diff -u -p -r1.3 vcd.c --- src/input/vcd/libvcd/vcd.c 1 Jan 2005 02:43:59 -0000 1.3 +++ src/input/vcd/libvcd/vcd.c 8 Dec 2006 15:59:38 -0000 @@ -1664,7 +1664,7 @@ _write_sequence (VcdObj *obj, int track_ track->info->ahdr[i].bitrate / 1024, _mode_str[track->info->ahdr[i].mode]); - strncat (buf2, buf, sizeof(buf)); + strncat (buf2, buf, sizeof(buf2) - strlen(buf2) - 1); } vcd_info ("writing track %d, %s, %s, %s...", track_idx + 2, Index: src/libsputext/demux_sputext.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libsputext/demux_sputext.c,v retrieving revision 1.49 diff -u -p -r1.49 demux_sputext.c --- src/libsputext/demux_sputext.c 10 Jul 2006 22:08:30 -0000 1.49 +++ src/libsputext/demux_sputext.c 8 Dec 2006 15:59:38 -0000 @@ -915,7 +915,8 @@ static subtitle_t *sub_read_line_jacobsu return NULL; trail_space(directive); strncat(line2, directive, - (LINE_LEN > 511) ? LINE_LEN : 511); + ((LINE_LEN > 511) ? LINE_LEN-1 : 511) + - strlen(line2)); break; } default: Index: src/libw32dll/wine/module.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libw32dll/wine/module.c,v retrieving revision 1.18 diff -u -p -r1.18 module.c --- src/libw32dll/wine/module.c 11 Jun 2006 15:09:47 -0000 1.18 +++ src/libw32dll/wine/module.c 8 Dec 2006 15:59:39 -0000 @@ -389,9 +389,7 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR lib strncpy(path, libname, sizeof(path) - 1); } else { /* check default user path */ - strncpy(path, win32_def_path, sizeof(path) - 2); - strcat(path, "/"); - strncat(path, libname, sizeof(path) - strlen(libname)); + snprintf(path, sizeof(path), "%s/%s", win32_def_path, libname); } wm = MODULE_LoadLibraryExA( path, hfile, flags ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit unison
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package unison checked in at Mon Dec 11 01:47:28 CET 2006. -------- New Changes file: --- /dev/null 2002-12-09 23:01:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/unison/unison-gtk1.changes 2006-12-11 01:31:00.000000000 +0100 @@ -0,0 +1,99 @@ +------------------------------------------------------------------- +Wed Dec 6 22:55:50 CET 2006 - seife(a)suse.de + +- add unison-gtk1, a binary compiled against lablgtk + +------------------------------------------------------------------- +Mon Sep 25 17:08:31 CEST 2006 - mhopf(a)suse.de + +- Update to version 2.17.1 +- Completely rewritten backup function (actually working now) +- Ip V6 support +- Several bug fixes + +------------------------------------------------------------------- +Thu Sep 21 02:11:42 CEST 2006 - seife(a)suse.de + +- switch to GTK2 / lablgtk2 + +------------------------------------------------------------------- +Wed Jan 25 21:42:26 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Mon Oct 10 16:05:21 CEST 2005 - rommel(a)suse.de + +- update to version 2.13.16 (includes all of our recent fixes) +- updated spec file, manual is available in html now + +------------------------------------------------------------------- +Tue Mar 15 15:22:02 CET 2005 - ro(a)suse.de + +- enable optimized compile on x86_64 + +------------------------------------------------------------------- +Wed Sep 15 01:18:01 CEST 2004 - ro(a)suse.de + +- fix build with ocaml-3.08 (from unison-hackers ml) + +------------------------------------------------------------------- +Sat Jan 10 21:42:14 CET 2004 - adrian(a)suse.de + +- build as user + +------------------------------------------------------------------- +Fri Aug 15 17:00:41 CEST 2003 - adrian(a)suse.de + +- add desktop file + +------------------------------------------------------------------- +Tue Jul 22 11:59:27 CEST 2003 - rommel(a)suse.de + +- fixed "invalid escape sequence" error messages +- fixed %install (not using make install anymore) +- compiling with thread support + +------------------------------------------------------------------- +Wed May 7 01:35:49 CEST 2003 - ro(a)suse.de + +- fix tail calling syntax + +------------------------------------------------------------------- +Mon Jan 27 12:27:41 CET 2003 - rommel(a)suse.de + +- replaced pdf file (unreadable) with ps file + +------------------------------------------------------------------- +Tue Sep 17 17:34:28 CEST 2002 - ro(a)suse.de + +- removed bogus self-provides + +------------------------------------------------------------------- +Tue May 28 00:46:29 CEST 2002 - ro(a)suse.de + +- update to 2.9.1 makes it build with current ocaml + +------------------------------------------------------------------- +Fri Sep 14 12:48:12 CEST 2001 - grimmer(a)suse.de + +- Update to 2.7.7, which fixes the following bugs (since + 2.7.1): + + * Fixed a silly bug that would reliably prevent the Unison + client from starting in 2.7.4. + * Bug fix (2.7.4): read the initial connection header one byte + at a time, so that we don't block if the header is shorter + than expected. + +------------------------------------------------------------------- +Wed Aug 29 21:07:36 CEST 2001 - grimmer(a)suse.de + +- Update to 2.7.1 (see the NEWS file for changes) +- updated PDF manual to latest version + +------------------------------------------------------------------- +Thu Aug 16 17:26:58 CEST 2001 - grimmer(a)suse.de + +- Initial package for SuSE Linux (version 2.6.59) + --- unison/unison.changes 2006-09-26 16:59:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/unison/unison.changes 2006-12-06 22:56:12.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 6 22:55:50 CET 2006 - seife(a)suse.de + +- add unison-gtk1, a binary compiled against lablgtk + +------------------------------------------------------------------- New: ---- unison-gtk1.changes unison-gtk1.desktop unison-gtk1.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unison-gtk1.spec ++++++ # # spec file for package unison-gtk1 (Version 2.17.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: unison-gtk1 BuildRequires: gtk-devel lablgtk update-desktop-files License: GNU General Public License (GPL) Group: Productivity/Networking/Other Autoreqprov: on Version: 2.17.1 Release: 1 Source0: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%… Source1: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%… Source2: %name.desktop URL: http://www.cis.upenn.edu/~bcpierce/unison BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A file synchronization tool %description Unison is a file synchronization tool for Unix and Windows. It allows two replicas of a collection of files and directories to be stored on different hosts (or different disks on the same host), modified separately, then brought up to date by propagating the changes in each replica to the other. Authors: -------- Benjamin Pierce <bcpierce(a)cis.upenn.edu> %prep %setup -q -n unison-%version %build %ifarch s390 s390x make UISTYLE=gtk NATIVE=false THREADS=false %else make UISTYLE=gtk NATIVE=true THREADS=true %endif %install [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 755 unison $RPM_BUILD_ROOT%{_bindir}/%name install -m 644 %{SOURCE1} unison-manual.html %suse_update_desktop_file -i %name Utility SyncUtility %ifarch s390 s390x # do not strip non-optimized builds export NO_BRP_STRIP_DEBUG=true %endif %clean rm -rf $RPM_BUILD_ROOT; %files %defattr(-, root, root) %doc BUGS.txt CONTRIB COPYING NEWS README ROADMAP.txt TODO.txt unison-manual.html /usr/share/applications/* %{_bindir}/%{name} %changelog -n unison-gtk1 * Wed Dec 06 2006 - seife(a)suse.de - add unison-gtk1, a binary compiled against lablgtk * Mon Sep 25 2006 - mhopf(a)suse.de - Update to version 2.17.1 - Completely rewritten backup function (actually working now) - Ip V6 support - Several bug fixes * Thu Sep 21 2006 - seife(a)suse.de - switch to GTK2 / lablgtk2 * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Oct 10 2005 - rommel(a)suse.de - update to version 2.13.16 (includes all of our recent fixes) - updated spec file, manual is available in html now * Tue Mar 15 2005 - ro(a)suse.de - enable optimized compile on x86_64 * Wed Sep 15 2004 - ro(a)suse.de - fix build with ocaml-3.08 (from unison-hackers ml) * Sat Jan 10 2004 - adrian(a)suse.de - build as user * Fri Aug 15 2003 - adrian(a)suse.de - add desktop file * Tue Jul 22 2003 - rommel(a)suse.de - fixed "invalid escape sequence" error messages - fixed %%install (not using make install anymore) - compiling with thread support * Wed May 07 2003 - ro(a)suse.de - fix tail calling syntax * Mon Jan 27 2003 - rommel(a)suse.de - replaced pdf file (unreadable) with ps file * Tue Sep 17 2002 - ro(a)suse.de - removed bogus self-provides * Tue May 28 2002 - ro(a)suse.de - update to 2.9.1 makes it build with current ocaml * Fri Sep 14 2001 - grimmer(a)suse.de - Update to 2.7.7, which fixes the following bugs (since 2.7.1): * Fixed a silly bug that would reliably prevent the Unison client from starting in 2.7.4. * Bug fix (2.7.4): read the initial connection header one byte at a time, so that we don't block if the header is shorter than expected. * Wed Aug 29 2001 - grimmer(a)suse.de - Update to 2.7.1 (see the NEWS file for changes) - updated PDF manual to latest version * Thu Aug 16 2001 - grimmer(a)suse.de - Initial package for SuSE Linux (version 2.6.59) ++++++ unison.spec ++++++ --- /var/tmp/diff_new_pack.7EcbLu/_old 2006-12-11 01:47:16.000000000 +0100 +++ /var/tmp/diff_new_pack.7EcbLu/_new 2006-12-11 01:47:16.000000000 +0100 @@ -12,11 +12,11 @@ Name: unison BuildRequires: gtk2-devel lablgtk2 update-desktop-files -License: GPL +License: GNU General Public License (GPL) Group: Productivity/Networking/Other Autoreqprov: on Version: 2.17.1 -Release: 1 +Release: 20 Source0: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%… Source1: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%… Source2: %name.desktop @@ -68,6 +68,8 @@ %{_bindir}/%{name} %changelog -n unison +* Wed Dec 06 2006 - seife(a)suse.de +- add unison-gtk1, a binary compiled against lablgtk * Mon Sep 25 2006 - mhopf(a)suse.de - Update to version 2.17.1 - Completely rewritten backup function (actually working now) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sysconfig
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package sysconfig checked in at Mon Dec 11 01:47:22 CET 2006. -------- --- sysconfig/sysconfig.changes 2006-11-20 13:40:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2006-12-10 13:48:20.000000000 +0100 @@ -1,0 +2,12 @@ +Sun Dec 10 09:25:19 CET 2006 - zoz(a)suse.de + +- new version 0.60.5 +- ifup-dhcp: To make 'ifup-dhcp status' deal with infinite leases as + handed out by BOOTP servers or misconfigured DHCP servers, we also + check that case for 'status'. (Bug 192745) + See changes for 'stop' at Mon Jan 26 18:21:09 CET 2004 +- Fixed handling of 'ficon' interfaces. (Bug 181998) +- rename_netiface: Don't be confused by two digit interface numbers + (eth1 was renamed if eth1* existed) (Bug 204964) + +------------------------------------------------------------------- Old: ---- sysconfig-0.60.4.tar.bz2 New: ---- sysconfig-0.60.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.iKH6QO/_old 2006-12-11 01:47:08.000000000 +0100 +++ /var/tmp/diff_new_pack.iKH6QO/_new 2006-12-11 01:47:08.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package sysconfig (Version 0.60.4) +# spec file for package sysconfig (Version 0.60.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: sysconfig BuildRequires: sysfsutils -Version: 0.60.4 +Version: 0.60.5 Release: 1 Summary: The sysconfig scheme Group: System/Base @@ -208,6 +208,15 @@ %{insserv_cleanup} %changelog -n sysconfig +* Sun Dec 10 2006 - zoz(a)suse.de +- new version 0.60.5 +- ifup-dhcp: To make 'ifup-dhcp status' deal with infinite leases as + handed out by BOOTP servers or misconfigured DHCP servers, we also + check that case for 'status'. (Bug 192745) + See changes for 'stop' at Mon Jan 26 18:21:09 CET 2004 +- Fixed handling of 'ficon' interfaces. (Bug 181998) +- rename_netiface: Don't be confused by two digit interface numbers + (eth1 was renamed if eth1* existed) (Bug 204964) * Mon Nov 20 2006 - zoz(a)suse.de - new version 0.60.4 - Removed replacements for pidof, checkproc, killproc again (See ++++++ sysconfig-0.60.4.tar.bz2 -> sysconfig-0.60.5.tar.bz2 ++++++ ++++ 28243 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit susevbox
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package susevbox checked in at Mon Dec 11 01:47:11 CET 2006. -------- --- susevbox/susevbox.changes 2006-01-25 21:41:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/susevbox/susevbox.changes 2006-12-10 14:04:55.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Dec 10 14:03:35 CET 2006 - kkeil(a)suse.de + +- move susevbox from /usr/X11R6/bin to /usr/bin (#227437) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ susevbox.spec ++++++ --- /var/tmp/diff_new_pack.9MutNe/_old 2006-12-11 01:47:00.000000000 +0100 +++ /var/tmp/diff_new_pack.9MutNe/_new 2006-12-11 01:47:00.000000000 +0100 @@ -1,24 +1,24 @@ # # spec file for package susevbox (Version 1.1) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: susevbox BuildRequires: gtk i4l-vbox mgetty perl-Tk -License: GPL +License: GNU General Public License (GPL) Group: Hardware/Modem Requires: i4l-vbox mgetty mktemp perl_tk Autoreqprov: on Summary: A Configuration Tool for Vbox and an Answering Machine Version: 1.1 -Release: 1529 +Release: 1564 Source: %{name}-%{version}.tar.bz2 Patch: %{name}-%{version}.dif Patch1: %{name}-msgbox.diff @@ -43,12 +43,11 @@ %install [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; -install -d $RPM_BUILD_ROOT/usr/X11R6/bin install -d $RPM_BUILD_ROOT/usr/bin install -d $RPM_BUILD_ROOT/usr/lib/susevbox/messages install -d $RPM_BUILD_ROOT/usr/sbin install -d $RPM_BUILD_ROOT/etc -install -m 755 SuSEVbox $RPM_BUILD_ROOT/usr/X11R6/bin +install -m 755 SuSEVbox $RPM_BUILD_ROOT/usr/bin install -m 700 SuSEVboxConf $RPM_BUILD_ROOT/usr/sbin install -m 755 susevboxplay $RPM_BUILD_ROOT/usr/bin install -m 755 susevboxconv $RPM_BUILD_ROOT/usr/bin @@ -71,7 +70,7 @@ %defattr(-, root, root) %config /etc/vboxconfrc %doc README.SuSE susevboxrc-example -/usr/X11R6/bin/SuSEVbox +/usr/bin/SuSEVbox /usr/bin/susevboxconv /usr/bin/susevboxplay %dir /usr/lib/susevbox @@ -88,6 +87,8 @@ /usr/sbin/SuSEVboxConf %changelog -n susevbox +* Sun Dec 10 2006 - kkeil(a)suse.de +- move susevbox from /usr/X11R6/bin to /usr/bin (#227437) * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Nov 02 2005 - dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit stratagus
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package stratagus checked in at Mon Dec 11 01:47:02 CET 2006. -------- --- stratagus/stratagus.changes 2006-11-03 22:02:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/stratagus/stratagus.changes 2006-12-09 20:11:37.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Dec 9 20:11:20 CET 2006 - sndirsch(a)suse.de + +- updated to 2.2alpha + +------------------------------------------------------------------- Old: ---- stratagus-061103.tar.bz2 New: ---- stratagus-2.2alpha.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stratagus.spec ++++++ --- /var/tmp/diff_new_pack.6RMeSg/_old 2006-12-11 01:46:57.000000000 +0100 +++ /var/tmp/diff_new_pack.6RMeSg/_new 2006-12-11 01:46:57.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package stratagus (Version 061103) +# spec file for package stratagus (Version 2.2alpha) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,13 +21,13 @@ BuildRequires: xorg-x11-devel %endif URL: http://stratagus.sourceforge.net/ -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: Amusements/Games/Strategy/Real Time Autoreqprov: on -Version: 061103 +Version: 2.2alpha Release: 1 Summary: Real-time strategy gaming engine -Source: stratagus-%{version}.tar.bz2 +Source: stratagus-2.2alpha.tar.gz Patch0: ccflags.diff Patch1: lua51.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,7 +46,7 @@ Lutz Sammer %prep -%setup -n trunk +%setup -n stratagus-061103 %patch0 #%patch1 ## build aganist lua50 instead echo "env.Append(CCFLAGS = Split('$RPM_OPT_FLAGS -fno-strict-aliasing'))" >> SConstruct @@ -64,6 +64,8 @@ /usr/bin/stratagus %changelog -n stratagus +* Sat Dec 09 2006 - sndirsch(a)suse.de +- updated to 2.2alpha * Fri Nov 03 2006 - sndirsch(a)suse.de - updated CVS sources (2006-11-03) * various bugfixes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sarien
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package sarien checked in at Mon Dec 11 01:46:55 CET 2006. -------- --- sarien/sarien.changes 2006-08-30 19:08:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/sarien/sarien.changes 2006-12-10 11:02:37.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Dec 10 11:02:15 CET 2006 - sndirsch(a)suse.de + +- moved executable to /usr/games (Bug #227431) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sarien.spec ++++++ --- /var/tmp/diff_new_pack.wBBSwJ/_old 2006-12-11 01:46:30.000000000 +0100 +++ /var/tmp/diff_new_pack.wBBSwJ/_new 2006-12-11 01:46:30.000000000 +0100 @@ -13,11 +13,11 @@ Name: sarien BuildRequires: SDL-devel xorg-x11 URL: http://sarien.sourceforge.net/ -License: GPL +License: GNU General Public License (GPL) Group: Amusements/Games/Other Autoreqprov: on Version: 0.7.0 -Release: 897 +Release: 921 Summary: Interpreter for Early Sierra On-Line Adventure Games Source: %name-%version.tar.bz2 Patch: %name-%version.dif @@ -53,26 +53,28 @@ %build rm -f config.cache CFLAGS="$RPM_OPT_FLAGS" \ -./configure --with-alsa --with-sdl --prefix=/usr/X11R6 +./configure --with-alsa --with-sdl --prefix=/usr make %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin +mkdir -p $RPM_BUILD_ROOT/usr/games mkdir -p $RPM_BUILD_ROOT/etc -install -m 755 bin/sarien $RPM_BUILD_ROOT/usr/X11R6/bin +install -m 755 bin/sarien $RPM_BUILD_ROOT/usr/games install -m 644 etc/sarien.cfg $RPM_BUILD_ROOT/etc/sarien.conf %files %defattr(-,root,root) %doc doc/* -/usr/X11R6/bin/sarien +/usr/games/sarien %config /etc/sarien.conf %clean rm -rf $RPM_BUILD_ROOT %changelog -n sarien +* Sun Dec 10 2006 - sndirsch(a)suse.de +- moved executable to /usr/games (Bug #227431) * Wed Aug 30 2006 - sndirsch(a)suse.de - minor warning fix (Bug #202244) * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0