April 2009 - openSUSE Commits - openSUSE Mailing Lists

drop kde4-kaffeine from openSUSE:Factory
by root＠Hilbert.suse.de 30 Apr '09

30 Apr '09

Hello community, FYI: Package kde4-kaffeine was dropped from openSUSE:Factory at Thu Apr 30 12:07:54 CEST 2009. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=kd… 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

drop kde4-k3b from openSUSE:Factory
by root＠Hilbert.suse.de 30 Apr '09

30 Apr '09

Hello community, FYI: Package kde4-k3b was dropped from openSUSE:Factory at Thu Apr 30 12:07:30 CEST 2009. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=kd… 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

drop kde4-amarok from openSUSE:Factory
by root＠Hilbert.suse.de 30 Apr '09

30 Apr '09

Hello community, FYI: Package kde4-amarok was dropped from openSUSE:Factory at Thu Apr 30 12:07:05 CEST 2009. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=kd… 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 asio for openSUSE:Factory
by root＠Hilbert.suse.de 29 Apr '09

29 Apr '09

Hello community, here is the log from the commit of package asio for openSUSE:Factory checked in at Wed Apr 29 02:49:18 CEST 2009. -------- --- asio/asio.changes 2009-01-14 18:11:23.000000000 +0100 +++ asio/asio.changes 2009-04-29 01:37:17.531007000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 29 01:37:10 CEST 2009 - ro(a)suse.de + +- fix build (add missing includes) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- asio-gcc43.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ asio.spec ++++++ --- /var/tmp/diff_new_pack.K29532/_old 2009-04-29 02:48:10.000000000 +0200 +++ /var/tmp/diff_new_pack.K29532/_new 2009-04-29 02:48:10.000000000 +0200 @@ -21,9 +21,10 @@ Name: asio Version: 1.2.0 -Release: 1 +Release: 2 Url: http://asio.sourceforge.net/ Source0: http://downloads.sourceforge.net/asio/asio-%{version}.tar.bz2 +Patch0: asio-gcc43.patch License: BSD 3-Clause Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -63,6 +64,7 @@ %prep %setup -q +%patch0 %build %configure @@ -84,6 +86,8 @@ %{_includedir}/asio.hpp %changelog +* Wed Apr 29 2009 ro(a)suse.de +- fix build (add missing includes) * Wed Jan 14 2009 hfiguiere(a)suse.de - Update to 1.2.0 * Support for UNIX domain sockets. @@ -107,5 +111,5 @@ * Mon Aug 11 2008 ro(a)suse.de - do not redefine debug_package - use nodebuginfo instead and set debuginfo to no in PDB -* Sat Apr 05 2008 hfiguiere(a)suse.de +* Sun Apr 06 2008 hfiguiere(a)suse.de - Initial checkin ++++++ asio-gcc43.patch ++++++ --- src/examples/buffers/reference_counted.cpp +++ src/examples/buffers/reference_counted.cpp @@ -12,6 +12,7 @@ #include <boost/bind.hpp> #include <boost/enable_shared_from_this.hpp> #include <boost/shared_ptr.hpp> +#include <iostream> #include <vector> using asio::ip::tcp; --- src/examples/nonblocking/third_party_lib.cpp +++ src/examples/nonblocking/third_party_lib.cpp @@ -13,6 +13,7 @@ #include <boost/bind.hpp> #include <boost/shared_ptr.hpp> #include <boost/enable_shared_from_this.hpp> +#include <iostream> using asio::ip::tcp; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-driver-video for openSUSE:Factory
by root＠Hilbert.suse.de 29 Apr '09

29 Apr '09

Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Wed Apr 29 02:48:03 CEST 2009. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-04-28 03:54:38.000000000 +0200 +++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-04-29 01:51:17.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 29 01:36:49 CEST 2009 - sndirsch(a)suse.de + +- xf86-video-siliconmotion 1.7.1 + * various driver fixes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-video-siliconmotion-1.7.0.tar.bz2 New: ---- xf86-video-siliconmotion-1.7.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.M20468/_old 2009-04-29 02:47:24.000000000 +0200 +++ /var/tmp/diff_new_pack.M20468/_new 2009-04-29 02:47:24.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 56 +Release: 57 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -52,7 +52,7 @@ Source20: xf86-video-s3-0.6.1.tar.bz2 Source21: xf86-video-s3virge-1.10.2.tar.bz2 Source22: xf86-video-savage-2.2.1.tar.bz2 -Source23: xf86-video-siliconmotion-1.7.0.tar.bz2 +Source23: xf86-video-siliconmotion-1.7.1.tar.bz2 Source24: xf86-video-sis-0.10.1.tar.bz2 Source25: xf86-video-sisusb-0.9.1.tar.bz2 Source33: xf86-video-tdfx-1.4.1.tar.bz2 @@ -268,6 +268,9 @@ /var/lib/hardware/ids/20.%{name} %changelog +* Wed Apr 29 2009 sndirsch(a)suse.de +- xf86-video-siliconmotion 1.7.1 + * various driver fixes * Tue Apr 28 2009 sndirsch(a)suse.de - intel-gpu-tools 1.0 * This little package is an amalgamation of a few things: ++++++ xf86-video-siliconmotion-1.7.0.tar.bz2 -> xf86-video-siliconmotion-1.7.1.tar.bz2 ++++++ ++++ 1736 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.0/ChangeLog new/xf86-video-siliconmotion-1.7.1/ChangeLog --- old/xf86-video-siliconmotion-1.7.0/ChangeLog 2008-12-29 22:31:14.000000000 +0100 +++ new/xf86-video-siliconmotion-1.7.1/ChangeLog 2009-04-28 22:14:46.000000000 +0200 @@ -1,3 +1,99 @@ +commit abf1ba79f2bfe61f24cfa43deb0400d7c5f95bd5 +Author: Francisco Jerez <currojerez(a)riseup.net> +Date: Tue Apr 21 21:37:45 2009 +0200 + + Increase the maximum clock value to 200MHz on SM712. + + The default MCLK setting was higher than the clock limit, and it + failed. + +commit 41e5c49024d4e27a7be3da02017000a22b59016f +Author: Francisco Jerez <currojerez(a)riseup.net> +Date: Tue Apr 21 21:36:10 2009 +0200 + + Don't attempt monitor detection on SM712. + + The databook says nothing about it, and it doesn't work. + +commit 6691678b5f04d52a1e08f9eaa6d511df9b7eeb4d +Author: Jamie Lentin <jm(a)lentin.co.uk> +Date: Thu Mar 19 21:54:12 2009 +0000 + + Stop clearing of "VESA compliance power down mode" bit + + Clearing this bit causes an OQO 01+ w/SMI720 to power down the LCD, + leave it alone. + + Signed-off-by: Jamie Lentin <jm(a)lentin.co.uk> + Signed-off-by: Francisco Jerez <currojerez(a)riseup.net> + +commit 05480382c508bd27c1755405518ce9c339f0f80e +Author: Matthieu Herrb <matthieu.herrb(a)laas.fr> +Date: Fri Mar 13 21:19:16 2009 +0100 + + Fix direct access to IO space on chipsets with no IOBase mapping. + + Signed-off-by: Francisco Jerez <currojerez(a)riseup.net> + +commit e62807140ede74e262ed70c846017dc3506b511e +Author: Niels de Vos <niels.devos(a)wincor-nixdorf.com> +Date: Wed Feb 11 10:10:13 2009 +0100 + + siliconmotion: Fix disabling of debugging if SMI501_CLI_DEBUG is set to 0 + + Due to checking if SMI501_CLI_DEBUG is defined, some debugging will + be enabled if SMI501_CLI_DEBUG is set to 0. A single #if should be + used instead. Some debugging code already does this. + + Signed-off-by: Niels de Vos <niels.devos(a)wincor-nixdorf.com> + Signed-off-by: Francisco Jerez <currojerez(a)riseup.net> + +commit 0b34c4a29fcf45ac24361b4691cca0fd99cc3a3f +Author: Francisco Jerez <currojerez(a)riseup.net> +Date: Wed Feb 4 03:49:08 2009 +0100 + + Wait for vertical retrace before writing registers at SMILynx_CrtcDPMS_* + +commit 1d46cca27b0d38d5355b5f93dd0ed0fe4f250d3f +Author: Francisco Jerez <currojerez(a)riseup.net> +Date: Tue Feb 3 22:15:45 2009 +0100 + + Drop the outdated configuration options documentation in README. + +commit 64f722c3121a8f28cfc5b532ddec0ac83095ac95 +Author: Francisco Jerez <currojerez(a)riseup.net> +Date: Tue Feb 3 22:17:33 2009 +0100 + + Minor corrections at the man page. + +commit 94d9c659b71c84db46fa279d9d8736e1589e155c +Author: Francisco Jerez <currojerez(a)riseup.net> +Date: Tue Feb 3 22:18:14 2009 +0100 + + Set dualhead to on by default on SM72x chipsets. + +commit 4d98e9c6a6e357ed736cd312a957c1e0a7b1d36b +Author: Francisco Jerez <currojerez(a)riseup.net> +Date: Wed Feb 4 01:56:20 2009 +0100 + + Dynamically switch virtual refresh mode. + + Probably this makes dualhead mode more useful because it makes + possible displaying video on the LCD as long as the CRT output is + disabled or cloned. + +commit 1c57cfa814504c33fcad51115d77f2d166fb7903 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Fri Jan 30 21:00:17 2009 -0800 + + Add README with pointers to mailing list, bugzilla & git repos + +commit 2aee107d992cb58bfbb2f527cfa73ea9f6957998 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Fri Jan 9 16:33:43 2009 -0800 + + Remove xorgconfig & xorgcfg from See Also list in man page + commit fdc2c50682b240e5966e4e5a7b45552ee2043bfc Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br> Date: Mon Dec 29 18:41:05 2008 -0200 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.0/configure.ac new/xf86-video-siliconmotion-1.7.1/configure.ac --- old/xf86-video-siliconmotion-1.7.0/configure.ac 2008-12-29 21:40:55.000000000 +0100 +++ new/xf86-video-siliconmotion-1.7.1/configure.ac 2009-04-28 22:13:23.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-siliconmotion], - 1.7.0, + 1.7.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-siliconmotion) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.0/man/siliconmotion.man new/xf86-video-siliconmotion-1.7.1/man/siliconmotion.man --- old/xf86-video-siliconmotion-1.7.0/man/siliconmotion.man 2008-12-12 18:50:32.000000000 +0100 +++ new/xf86-video-siliconmotion-1.7.1/man/siliconmotion.man 2009-03-20 00:26:11.000000000 +0100 @@ -106,12 +106,12 @@ .TP .BI "Option \*qUseBIOS\*q \*q" boolean \*q Use the BIOS to set the modes. This is used for custom panel timings. -Default: on. +Default: off for SM72x and SM5xx, otherwise on. .TP .BI "Option \*qDualhead\*q \*q" boolean \*q Enable dualhead mode. -Currently not all chips are supported and on lynx chipsets hardware video -overlay (XV) will only work on the secondary VGA output. +Currently not all chips are supported and hardware video +overlay (XV) support may have some limitations. Default: off. .TP .BI "Option \*qPanelSize\*q \*q" width x height \*q @@ -191,7 +191,7 @@ option. .SH SEE ALSO -__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__) +__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__) .SH SUPPORT For assistance with this driver, or __xservername__ in general, check the web diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.0/README new/xf86-video-siliconmotion-1.7.1/README --- old/xf86-video-siliconmotion-1.7.0/README 2008-09-18 23:00:14.000000000 +0200 +++ new/xf86-video-siliconmotion-1.7.1/README 2009-03-20 00:26:11.000000000 +0100 @@ -1,76 +1,22 @@ -What works: -- Supports 8bpp, 16bpp and 24bpp. Heavy testing on SM720. +xf86-video-siliconmotion - Silicon Motion video driver for the Xorg X server -XCONFIG options: +Please submit bugs & patches to the Xorg bugzilla: -The driver supports quite a few different XConfig options, which can -be used to tune the driver and improve performance. Without any options, -the driver will use conservative settings which should work on most -hardware. Large improvements in performance are possible by selecting -the proper options, which will probably work on most systems. - -Cursor: - -- "hwcursor" "off" behaves exactly like "swcursor". Default: "on" -- "swcursor" will disable the HW Cursor. HW Cursor is used by default and - no option is needed to enable it. - -Display: - -- "ShadowFB" Use shadow framebuffer. Default: off. -- "Rotate" "cw" | "ccw" Rotate the screen CW - clockwise or CCW - counter - clockwise. Uses ShadowFB. Default: no rotation. -- "UseBIOS" Use BIOS to set modes. Default: on. -- "ZoomOnLCD" Allow changing resolution on panel. Default: off. - -Overlays: - -- "VideoKey" Set chroma key for video. Default: Off blue. -- "ByteSwap" Turn on YUV byte swapping. Defaul: off. - -Video memory: - -- "set_mclk" sets the memory clock, format is: - Option "set_mclk" "50000" - in the XF86Config file. Valid values are any - integer <= 100000, where 100000 == 100 MHz. - -Acceleration and graphic engine: - -- "NoAccel" turns off all acceleration -- "fifo_aggressive", "fifo_moderate" and "fifo_conservative" alter the settings - for the threshold at which the pixel FIFO takes over the internal - memory bus to refill itself. The smaller this threshold, the better - the acceleration performance of the card. You may try the fastest - setting ("aggressive") and move down if you encounter pixel corruption. - The optimal setting will probably depend on dot-clock and on color - depth. Note that specifying any of these options will also alter other - memory settings which should increase performance, so you should at - least use "fifo_conservative" (this uses the chip defaults). -- Common XAA acceleration options to disable primitives for test purposes: - "XaaNoScreenToScreenCopy" - "XaaNoSolidFillRect" - "XaaNoColor8x8PatternFillRect" - "XaaNoImageWriteRect" - "XaaNoPixmapCache" - -PCI bus: - -- "pci_burst" will enable PCI burst mode. This should work on all but a - few "broken" PCI chipsets, and will increase performance. Option may - take a parameter "on", "off", "yes", etc... -- "pci_retry" will allow the driver to rely on PCI Retry to program the - ViRGE registers. "pci_burst" must be enabled for this to work. - This will increase performance, especially for small fills/blits, - because the driver does not have to poll the ViRGE before sending it - commands to make sure it is ready. It should work on most - recent PCI chipsets. + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg -Debug: +All questions regarding this software should be directed at the +Xorg mailing list: -- "ShowCache" Enable or disable viewing offscreen cache memory. A - development debug option. Default: off. + http://lists.freedesktop.org/mailman/listinfo/xorg -Header: //Mercury/Projects/archives/XFree86/4.0/README.-arc 1.2 14 Sep 2000 12:28:36 Frido $ +The master development code repository can be found at: -$XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/README,v 1.3 2001/02/15 18:20:33 dawes Exp $ + git://anongit.freedesktop.org/git/xorg/driver/xf86-video-siliconmotion + + http://cgit.freedesktop.org/xorg/driver/xf86-video-siliconmotion + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + +---------------------------------------------------------------------------- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.0/src/smi_501.h new/xf86-video-siliconmotion-1.7.1/src/smi_501.h --- old/xf86-video-siliconmotion-1.7.0/src/smi_501.h 2008-12-29 18:55:08.000000000 +0100 +++ new/xf86-video-siliconmotion-1.7.1/src/smi_501.h 2009-03-20 00:26:11.000000000 +0100 @@ -1333,7 +1333,7 @@ } smi_cli_entry_t; -#ifdef SMI501_CLI_DEBUG +#if SMI501_CLI_DEBUG /* ensure there are "count" command list "slots" 8 bytes wide free */ #define BATCH_BEGIN(COUNT) \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.0/src/smi_driver.c new/xf86-video-siliconmotion-1.7.1/src/smi_driver.c --- old/xf86-video-siliconmotion-1.7.0/src/smi_driver.c 2008-12-29 21:39:50.000000000 +0100 +++ new/xf86-video-siliconmotion-1.7.1/src/smi_driver.c 2009-04-21 21:47:11.000000000 +0200 @@ -792,9 +792,13 @@ pSmi->PciInfo->func); #endif - pSmi->Dualhead = FALSE; - from = X_DEFAULT; + if(pSmi->Chipset == SMI_LYNX3DM && + pScrn->bitsPerPixel == 16) + pSmi->Dualhead = TRUE; + else + pSmi->Dualhead = FALSE; + if (xf86GetOptValBool(pSmi->Options, OPTION_DUALHEAD, &pSmi->Dualhead)) from = X_CONFIG; @@ -914,8 +918,7 @@ pSmi->clockRange.next = NULL; pSmi->clockRange.minClock = 20000; - if (pSmi->Chipset == SMI_LYNX3DM || - pSmi->Chipset == SMI_COUGAR3DR || + if (SMI_LYNXM_SERIES(pSmi->Chipset) || IS_MSOC(pSmi)) pSmi->clockRange.maxClock = 200000; else @@ -1535,7 +1538,7 @@ pSmi->FBReserved = pSmi->FBCursorOffset = pSmi->videoRAMBytes - (pSmi->Dualhead ? SMI501_CURSOR_SIZE << 1 : SMI501_CURSOR_SIZE); -# ifdef SMI501_CLI_DEBUG +# if SMI501_CLI_DEBUG if (pSmi->useEXA) { pSmi->batch_active = FALSE; pSmi->batch_length = 4096; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.0/src/smi.h new/xf86-video-siliconmotion-1.7.1/src/smi.h --- old/xf86-video-siliconmotion-1.7.0/src/smi.h 2008-12-29 18:55:32.000000000 +0100 +++ new/xf86-video-siliconmotion-1.7.1/src/smi.h 2009-03-20 00:26:11.000000000 +0100 @@ -264,7 +264,7 @@ structure */ void (*BlockHandler)(int i, pointer blockData, pointer pTimeout, pointer pReadMask); -#ifdef SMI501_CLI_DEBUG +#if SMI501_CLI_DEBUG /* SMI 501/502 Command List Interpreter */ Bool batch_active; int64_t *batch_handle; /* Virtual address */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.0/src/smilynx_crtc.c new/xf86-video-siliconmotion-1.7.1/src/smilynx_crtc.c --- old/xf86-video-siliconmotion-1.7.0/src/smilynx_crtc.c 2008-12-29 16:52:25.000000000 +0100 +++ new/xf86-video-siliconmotion-1.7.1/src/smilynx_crtc.c 2009-03-20 00:26:11.000000000 +0100 @@ -194,7 +194,7 @@ WRITE_VPR(pSmi, 0x0C, Base); WRITE_FPR(pSmi, FPR0C, Base); }else{ - if(pSmi->Dualhead && crtc == crtcConf->crtc[0]){ + if(pSmi->Dualhead && crtc == crtcConf->crtc[1]){ /* LCD */ /* FIFO1 read start address */ @@ -857,6 +857,7 @@ ScrnInfoPtr pScrn = crtc->scrn; SMIPtr pSmi = SMIPTR(pScrn); SMIRegPtr reg = pSmi->mode; + vgaHWPtr hwp = VGAHWPTR(pScrn); ENTER(); @@ -865,8 +866,41 @@ else reg->SR21 &= ~0x88; /* Enable DAC and color palette RAM */ + /* Wait for vertical retrace */ + while (hwp->readST01(hwp) & 0x8) ; + while (!(hwp->readST01(hwp) & 0x8)) ; + VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x21, reg->SR21); + if(mode == DPMSModeOn){ + /* Reload the LUT */ + SMILynx_CrtcLoadLUT_crt(crtc); + } + + LEAVE(); +} + +static void +SMILynx_CrtcDPMS_lcd(xf86CrtcPtr crtc, int mode) +{ + ScrnInfoPtr pScrn = crtc->scrn; + SMIPtr pSmi = SMIPTR(pScrn); + SMIRegPtr reg = pSmi->mode; + vgaHWPtr hwp = VGAHWPTR(pScrn); + + ENTER(); + + if(mode == DPMSModeOff) + reg->SR31 &= ~0x80; /* Disable Virtual Refresh */ + else + reg->SR31 |= 0x80; /* Enable Virtual Refresh */ + + /* Wait for vertical retrace */ + while (hwp->readST01(hwp) & 0x8) ; + while (!(hwp->readST01(hwp) & 0x8)) ; + + VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x31, reg->SR31); + LEAVE(); } @@ -912,56 +946,52 @@ LEAVE(FALSE); crtc->driver_private = crtcPriv; }else{ - if(pSmi->Dualhead){ - /* CRTC is LCD*/ - SMI_CrtcFuncsInit_base(&crtcFuncs, &crtcPriv); - crtcFuncs->mode_set = SMILynx_CrtcModeSet_lcd; - crtcFuncs->mode_fixup = SMILynx_CrtcModeFixup; - crtcPriv->adjust_frame = SMILynx_CrtcAdjustFrame; - crtcPriv->video_init = SMILynx_CrtcVideoInit_lcd; - crtcPriv->load_lut = SMILynx_CrtcLoadLUT_lcd; - - if(! (crtc = xf86CrtcCreate(pScrn,crtcFuncs))) - LEAVE(FALSE); - crtc->driver_private = crtcPriv; + /* CRTC0 can drive both outputs when virtual refresh is + disabled, and only the VGA output with virtual refresh + enabled. */ + SMI_CrtcFuncsInit_base(&crtcFuncs, &crtcPriv); - /* CRTC1 is CRT */ - SMI_CrtcFuncsInit_base(&crtcFuncs, &crtcPriv); + if(pSmi->useBIOS){ + crtcFuncs->mode_set = SMILynx_CrtcModeSet_bios; + }else{ crtcFuncs->dpms = SMILynx_CrtcDPMS_crt; - crtcFuncs->mode_set = SMILynx_CrtcModeSet_crt; - crtcFuncs->mode_fixup = SMILynx_CrtcModeFixup; - crtcPriv->adjust_frame = SMILynx_CrtcAdjustFrame; - crtcPriv->video_init = SMILynx_CrtcVideoInit_crt; - crtcPriv->load_lut = SMILynx_CrtcLoadLUT_crt; - if(! (crtc = xf86CrtcCreate(pScrn,crtcFuncs))) - LEAVE(FALSE); - crtc->driver_private = crtcPriv; + if(pSmi->Dualhead){ + /* The standard VGA CRTC registers get locked in + virtual refresh mode. */ + crtcFuncs->mode_set = SMILynx_CrtcModeSet_crt; - }else{ - /* CRTC0 is LCD, but in standard refresh mode - it is controlled through the primary VGA registers */ - SMI_CrtcFuncsInit_base(&crtcFuncs, &crtcPriv); - - if(pSmi->useBIOS){ - crtcFuncs->mode_set = SMILynx_CrtcModeSet_bios; }else{ - crtcFuncs->dpms = SMILynx_CrtcDPMS_crt; crtcFuncs->mode_set = SMILynx_CrtcModeSet_vga; } + } + + crtcFuncs->mode_fixup = SMILynx_CrtcModeFixup; + crtcPriv->adjust_frame = SMILynx_CrtcAdjustFrame; + crtcPriv->video_init = SMILynx_CrtcVideoInit_crt; + crtcPriv->load_lut = SMILynx_CrtcLoadLUT_crt; + + if(pSmi->HwCursor){ + crtcFuncs->set_cursor_colors = SMILynx_CrtcSetCursorColors_crt; + crtcFuncs->set_cursor_position = SMILynx_CrtcSetCursorPosition_crt; + crtcFuncs->show_cursor = SMILynx_CrtcShowCursor_crt; + crtcFuncs->hide_cursor = SMILynx_CrtcHideCursor_crt; + crtcFuncs->load_cursor_image = SMILynx_CrtcLoadCursorImage_crt; + } + if(! (crtc = xf86CrtcCreate(pScrn,crtcFuncs))) + LEAVE(FALSE); + crtc->driver_private = crtcPriv; + + if(pSmi->Dualhead){ + /* CRTC1 drives LCD when enabled. */ + SMI_CrtcFuncsInit_base(&crtcFuncs, &crtcPriv); + crtcFuncs->mode_set = SMILynx_CrtcModeSet_lcd; crtcFuncs->mode_fixup = SMILynx_CrtcModeFixup; + crtcFuncs->dpms = SMILynx_CrtcDPMS_lcd; crtcPriv->adjust_frame = SMILynx_CrtcAdjustFrame; - crtcPriv->video_init = SMILynx_CrtcVideoInit_crt; - crtcPriv->load_lut = SMILynx_CrtcLoadLUT_crt; - - if(pSmi->HwCursor){ - crtcFuncs->set_cursor_colors = SMILynx_CrtcSetCursorColors_crt; - crtcFuncs->set_cursor_position = SMILynx_CrtcSetCursorPosition_crt; - crtcFuncs->show_cursor = SMILynx_CrtcShowCursor_crt; - crtcFuncs->hide_cursor = SMILynx_CrtcHideCursor_crt; - crtcFuncs->load_cursor_image = SMILynx_CrtcLoadCursorImage_crt; - } + crtcPriv->video_init = SMILynx_CrtcVideoInit_lcd; + crtcPriv->load_lut = SMILynx_CrtcLoadLUT_lcd; if(! (crtc = xf86CrtcCreate(pScrn,crtcFuncs))) LEAVE(FALSE); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.0/src/smilynx_hw.c new/xf86-video-siliconmotion-1.7.1/src/smilynx_hw.c --- old/xf86-video-siliconmotion-1.7.0/src/smilynx_hw.c 2008-12-22 17:39:30.000000000 +0100 +++ new/xf86-video-siliconmotion-1.7.1/src/smilynx_hw.c 2009-03-20 00:26:25.000000000 +0100 @@ -80,19 +80,12 @@ /* Set DPMS state to Off */ mode->SR22 |= 0x30; - /* VESA compliance power down mode */ - mode->SR24 &= ~0x01; - if (pSmi->Chipset != SMI_COUGAR3DR) { /* Select no displays */ mode->SR31 &= ~0x07; - /* Enable virtual refresh */ - if(pSmi->Dualhead){ - mode->SR31 |= 0x80; - }else{ - mode->SR31 &= ~0x80; - } + /* Disable virtual refresh */ + mode->SR31 &= ~0x80; /* Disable expansion */ mode->SR32 &= ~0x03; @@ -131,7 +124,6 @@ VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x20, mode->SR20); VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x21, mode->SR21); VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x22, mode->SR22); - VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x24, mode->SR24); VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x31, mode->SR31); VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x32, mode->SR32); VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x34, mode->SR34); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.0/src/smilynx_output.c new/xf86-video-siliconmotion-1.7.1/src/smilynx_output.c --- old/xf86-video-siliconmotion-1.7.0/src/smilynx_output.c 2008-12-29 16:52:17.000000000 +0100 +++ new/xf86-video-siliconmotion-1.7.1/src/smilynx_output.c 2009-04-21 21:47:11.000000000 +0200 @@ -82,17 +82,25 @@ ScrnInfoPtr pScrn = output->scrn; SMIPtr pSmi = SMIPTR(pScrn); SMIRegPtr reg = pSmi->mode; + xf86CrtcConfigPtr crtcConf = XF86_CRTC_CONFIG_PTR(pScrn); ENTER(); switch (mode) { case DPMSModeOn: - if(pSmi->lcd == 2 /* LCD is DSTN */ - || pSmi->Dualhead /* Virtual Refresh is enabled */) + if(pSmi->Dualhead && + output->crtc == crtcConf->crtc[1]){ + /* Virtual Refresh is enabled */ + reg->SR21 &= ~0x10; /* Enable LCD framebuffer read operation and DSTN dithering engine */ - if(pSmi->lcd == 2 /* LCD is DSTN */ - && !pSmi->Dualhead /* Virtual Refresh is disabled */) - reg->SR21 &= ~0x20; /* Enable LCD framebuffer write operation */ + }else{ + if(pSmi->lcd == 2){ + /* LCD is DSTN */ + + reg->SR21 &= ~0x10; /* Enable LCD framebuffer read operation and DSTN dithering engine */ + reg->SR21 &= ~0x20; /* Enable LCD framebuffer write operation */ + } + } reg->SR31 |= 0x01; /* Enable LCD display*/ break; @@ -212,7 +220,7 @@ while (!(hwp->readST01(hwp) & 0x8)) ; while (hwp->readST01(hwp) & 0x8) ; - status = MMIO_IN8(pSmi->IOBase, 0x3C2) & 0x10; + status = VGAIN8(pSmi, 0x3C2) & 0x10; /* Restore previous state */ VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x21, mode->SR21); @@ -269,18 +277,17 @@ output->interlaceAllowed = FALSE; output->doubleScanAllowed = FALSE; - output->possible_crtcs = 1 << 0; - if(pSmi->Dualhead) - output->possible_clones = 0; - else - output->possible_clones = 1 << 1; + output->possible_crtcs = (1 << 0) | (1 << 1); + output->possible_clones = 1 << 1; - if(!pSmi->useBIOS){ + if(pSmi->Dualhead){ /* Output 1 is CRT */ SMI_OutputFuncsInit_base(&outputFuncs); outputFuncs->dpms = SMILynx_OutputDPMS_crt; outputFuncs->get_modes = SMILynx_OutputGetModes_crt; - outputFuncs->detect = SMILynx_OutputDetect_crt; + + if(pSmi->Chipset == SMI_LYNX3DM) + outputFuncs->detect = SMILynx_OutputDetect_crt; if(! (output = xf86OutputCreate(pScrn,outputFuncs,"VGA"))) LEAVE(FALSE); @@ -288,13 +295,8 @@ output->interlaceAllowed = FALSE; output->doubleScanAllowed = FALSE; - if(pSmi->Dualhead){ - output->possible_crtcs = 1 << 1; - output->possible_clones = 0; - }else{ - output->possible_crtcs = 1 << 0; - output->possible_clones = 1 << 0; - } + output->possible_crtcs = 1 << 0; + output->possible_clones = 1 << 0; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.7.0/src/smi_video.c new/xf86-video-siliconmotion-1.7.1/src/smi_video.c --- old/xf86-video-siliconmotion-1.7.0/src/smi_video.c 2008-12-29 21:34:59.000000000 +0100 +++ new/xf86-video-siliconmotion-1.7.1/src/smi_video.c 2009-03-20 00:26:11.000000000 +0100 @@ -1057,10 +1057,10 @@ dstBox.x2 = drw_x + drw_w; dstBox.y2 = drw_y + drw_h; - if(!xf86_crtc_clip_video_helper(pScrn, &crtc, NULL, &dstBox, &x1, &x2, &y1, &y2, clipBoxes, width, height)) + if(!xf86_crtc_clip_video_helper(pScrn, &crtc, crtcConf->crtc[0], &dstBox, &x1, &x2, &y1, &y2, clipBoxes, width, height)) LEAVE(Success); - if(pSmi->Dualhead && crtc == crtcConf->crtc[0]) + if(pSmi->Dualhead && crtc == crtcConf->crtc[1]) LEAVE(Success); /* Transform dstBox to the CRTC coordinates */ @@ -1516,7 +1516,7 @@ LEAVE(Success); } else { - if (!xf86_crtc_clip_video_helper(pScrn, &crtc, NULL, &dstBox, + if (!xf86_crtc_clip_video_helper(pScrn, &crtc, crtcConf->crtc[0], &dstBox, &x1, &x2, &y1, &y2, clipBoxes, width, height)) LEAVE(Success); @@ -1629,7 +1629,7 @@ drw_w, drw_h); } else{ - if(!pSmi->Dualhead || crtc == crtcConf->crtc[1]) + if(crtc == crtcConf->crtc[0]) SMI_DisplayVideo(pScrn, id, offset, width, height, dstPitch, x1, y1, x2, y2, &dstBox, src_w, src_h, drw_w, drw_h); } @@ -2461,7 +2461,7 @@ dstBox.y1 = drw_y; dstBox.y2 = drw_y + drw_h; - if(!xf86_crtc_clip_video_helper(surface->pScrn, &crtc, NULL, &dstBox, + if(!xf86_crtc_clip_video_helper(surface->pScrn, &crtc, crtcConf->crtc[0], &dstBox, &x1, &x2, &y1, &y2, clipBoxes, surface->width, surface->height)) LEAVE(Success); @@ -2485,7 +2485,7 @@ surface->height, surface->pitches[0], x1, y1, x2, y2, &dstBox, vid_w, vid_h, drw_w, drw_h); else{ - if(!pSmi->Dualhead || crtc == crtcConf->crtc[1]) + if(crtc == crtcConf->crtc[0]) SMI_DisplayVideo(surface->pScrn, surface->id, surface->offsets[0], surface->width, surface->height, surface->pitches[0], x1, y1, x2, y2, &dstBox, vid_w, vid_h, drw_w, drw_h); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 MozillaFirefox for openSUSE:Factory
by root＠Hilbert.suse.de 29 Apr '09

29 Apr '09

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at Wed Apr 29 02:47:11 CEST 2009. -------- --- MozillaFirefox/MozillaFirefox.changes 2009-03-27 10:14:42.000000000 +0100 +++ MozillaFirefox/MozillaFirefox.changes 2009-04-28 11:06:58.000000000 +0200 @@ -1,0 +2,34 @@ +Tue Apr 28 10:47:54 CEST 2009 - wr(a)rosenauer.org + +- security update to 3.0.10 + * MFSA 2009-23/CVE-2009-1313 (bmo#489647) + Crash in nsTextFrame::ClearTextRun() + +------------------------------------------------------------------- +Thu Apr 16 13:52:21 CEST 2009 - wr(a)rosenauer.org + +- security update to 3.0.9 (bnc#495473) + * MFSA 2009-14/CVE-2009-1302/CVE-2009-1303/CVE-2009-1304/CVE-2009-1305 + Crashes with evidence of memory corruption (rv:1.9.0.9) + * MFSA 2009-15/CVE-2009-0652 (bmo#479336) + URL spoofing with box drawing character + * MFSA 2009-16/CVE-2009-1306 (bmo#474536) + jar: scheme ignores the content-disposition: header on the + inner URI + * MFSA 2009-17/CVE-2009-1307 (bmo#481342) + Same-origin violations when Adobe Flash loaded via + view-source: scheme + * MFSA 2009-18/CVE-2009-1308 (bmo#481558) + XSS hazard using third-party stylesheets and XBL bindings + * MFSA 2009-19/CVE-2009-1309 (bmo#482206,478433) + Same-origin violations in XMLHttpRequest and + XPCNativeWrapper.toString + * MFSA 2009-20/CVE-2009-1310 (bmo#483086) + Malicious search plugins can inject code into arbitrary sites + * MFSA 2009-21/CVE-2009-1311 (bmo#471962) + POST data sent to wrong site when saving web page with + embedded frame + * MFSA 2009-22/CVE-2009-1312 (bmo#475636) + Firefox allows Refresh header to redirect to javascript: URIs + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- firefox-3.0.8-source.tar.bz2 l10n-3.0.8.tar.bz2 New: ---- firefox-3.0.10-source.tar.bz2 l10n-3.0.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.h15527/_old 2009-04-29 02:44:51.000000000 +0200 +++ /var/tmp/diff_new_pack.h15527/_new 2009-04-29 02:44:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 3.0.8) +# spec file for package MozillaFirefox (Version 3.0.10) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Provides: web_browser Provides: firefox -Version: 3.0.8 +Version: 3.0.10 Release: 1 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ @@ -60,7 +60,7 @@ %define __find_requires sh %{SOURCE4} %global provfind sh -c "grep -v '.so' | %__find_provides" %global __find_provides %provfind -%define releasedate 2009032600 +%define releasedate 2009042700 %define progname firefox %define progdir %{_prefix}/%_lib/%{progname} %if %suse_version > 1020 @@ -340,6 +340,34 @@ %{progdir}/defaults/profile/bookmarks.html %changelog +* Tue Apr 28 2009 wr(a)rosenauer.org +- security update to 3.0.10 + * MFSA 2009-23/CVE-2009-1313 (bmo#489647) + Crash in nsTextFrame::ClearTextRun() +* Thu Apr 16 2009 wr(a)rosenauer.org +- security update to 3.0.9 (bnc#495473) + * MFSA 2009-14/CVE-2009-1302/CVE-2009-1303/CVE-2009-1304/CVE-2009-1305 + Crashes with evidence of memory corruption (rv:1.9.0.9) + * MFSA 2009-15/CVE-2009-0652 (bmo#479336) + URL spoofing with box drawing character + * MFSA 2009-16/CVE-2009-1306 (bmo#474536) + jar: scheme ignores the content-disposition: header on the + inner URI + * MFSA 2009-17/CVE-2009-1307 (bmo#481342) + Same-origin violations when Adobe Flash loaded via + view-source: scheme + * MFSA 2009-18/CVE-2009-1308 (bmo#481558) + XSS hazard using third-party stylesheets and XBL bindings + * MFSA 2009-19/CVE-2009-1309 (bmo#482206,478433) + Same-origin violations in XMLHttpRequest and + XPCNativeWrapper.toString + * MFSA 2009-20/CVE-2009-1310 (bmo#483086) + Malicious search plugins can inject code into arbitrary sites + * MFSA 2009-21/CVE-2009-1311 (bmo#471962) + POST data sent to wrong site when saving web page with + embedded frame + * MFSA 2009-22/CVE-2009-1312 (bmo#475636) + Firefox allows Refresh header to redirect to javascript: URIs * Fri Mar 27 2009 wr(a)rosenauer.org - security update to 1.9.0.8 (bnc#488955,489411) * MFSA 2009-12/CVE-2009-1169 (bmo#460090,485217) @@ -422,7 +450,7 @@ - removed obsolete configure option (enable-gconf) * Fri Nov 07 2008 maw(a)suse.de - Review and approve changes. -* Tue Nov 04 2008 wr(a)rosenauer.org +* Wed Nov 05 2008 wr(a)rosenauer.org - moved gconf schema into branding packages (bnc#441646) * Tue Oct 28 2008 hfiguiere(a)suse.de - Fix missing %%endif (for fix for bnc#434283) @@ -702,7 +730,7 @@ U+3099 U+309A (see bugzilla #262718 comment #29). * Mon Mar 12 2007 maw(a)suse.de - Package gconf stuff. -* Wed Feb 21 2007 maw(a)suse.de +* Thu Feb 22 2007 maw(a)suse.de - Security update to 2.0.0.2 (#244923), which covers: + mfsa2007-01 * CVE-2007-0775 - layout engine crashes @@ -995,7 +1023,7 @@ - unlocalize bookmarks (#114279) * Thu Sep 08 2005 stark(a)suse.de - fixed some filemodes (#114849) -* Sat Sep 03 2005 stark(a)suse.de +* Sun Sep 04 2005 stark(a)suse.de - fixed gconf-backend patch to be able to use system prefs (#114054) * Thu Sep 01 2005 stark(a)suse.de @@ -1101,7 +1129,7 @@ - don't execute gconf magic within build environment * Sat Apr 16 2005 stark(a)suse.de - update to final 1.0.3 release -* Thu Apr 14 2005 ro(a)suse.de +* Fri Apr 15 2005 ro(a)suse.de - fix problem in postinstall script * Thu Apr 14 2005 stark(a)suse.de - included fixed lockdown patch for NLD @@ -1252,7 +1280,7 @@ - fixed inclusion of RealPlayer plugin again * Tue Oct 05 2004 stark(a)suse.de - small important fix in firefox-download.patch (Ximian #65472) -* Sat Oct 02 2004 stark(a)suse.de +* Sun Oct 03 2004 stark(a)suse.de - added security-fix from 0.10.1 (mozilla.org #259708) (#46687) * Fri Oct 01 2004 stark(a)suse.de - final fix for downloading to Desktop folder (Ximian #65756) ++++++ firefox-3.0.8-source.tar.bz2 -> firefox-3.0.10-source.tar.bz2 ++++++ MozillaFirefox/firefox-3.0.8-source.tar.bz2 MozillaFirefox/firefox-3.0.10-source.tar.bz2 differ: byte 11, line 1 ++++++ l10n-3.0.8.tar.bz2 -> l10n-3.0.10.tar.bz2 ++++++ MozillaFirefox/l10n-3.0.8.tar.bz2 MozillaFirefox/l10n-3.0.10.tar.bz2 differ: byte 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 celestia for openSUSE:Factory
by root＠Hilbert.suse.de 29 Apr '09

29 Apr '09

Hello community, here is the log from the commit of package celestia for openSUSE:Factory checked in at Wed Apr 29 02:17:28 CEST 2009. -------- --- KDE/celestia/celestia.changes 2009-04-05 11:15:31.000000000 +0200 +++ celestia/celestia.changes 2009-04-28 11:55:51.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 28 11:55:34 CEST 2009 - coolo(a)suse.de + +- fix compilation with gcc 4.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- celestia-1.5.1-gcc44.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ celestia.spec ++++++ --- /var/tmp/diff_new_pack.fT8197/_old 2009-04-29 02:16:23.000000000 +0200 +++ /var/tmp/diff_new_pack.fT8197/_new 2009-04-29 02:16:23.000000000 +0200 @@ -21,7 +21,7 @@ Name: celestia Summary: OpenGL Space Simulator Version: 1.5.1 -Release: 47 +Release: 48 License: GPL v2 or later Group: Productivity/Scientific/Astronomy Url: http://celestia.sourceforge.net @@ -39,6 +39,7 @@ Patch3: celestia-1.5.1-gcc43.patch Patch4: celestia-1.5.1-config.patch Patch5: celestia-1.5.1-theora.patch +Patch6: celestia-1.5.1-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define kdedir /opt/kde3 @@ -70,6 +71,7 @@ %patch3 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build . /etc/opt/kde3/common_options @@ -118,6 +120,8 @@ %{_datadir}/pixmaps/*.png %changelog +* Tue Apr 28 2009 coolo(a)suse.de +- fix compilation with gcc 4.4 * Sat Apr 04 2009 coolo(a)suse.de - refresh all patches to fix build * Wed Jun 25 2008 dmueller(a)suse.de ++++++ celestia-1.5.1-gcc44.patch ++++++ Index: celestia-1.5.1/src/celengine/overlay.h =================================================================== --- celestia-1.5.1.orig/src/celengine/overlay.h +++ celestia-1.5.1/src/celengine/overlay.h @@ -12,6 +12,7 @@ #include <string> #include <iostream> +#include <cstdio> #include <celtxf/texturefont.h> Index: celestia-1.5.1/src/celengine/star.cpp =================================================================== --- celestia-1.5.1.orig/src/celengine/star.cpp +++ celestia-1.5.1/src/celengine/star.cpp @@ -10,6 +10,7 @@ #include <celmath/mathlib.h> #include <cstring> #include <cassert> +#include <cstdio> #include "celestia.h" #include "astro.h" #include "orbit.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 crash for openSUSE:Factory
by root＠Hilbert.suse.de 29 Apr '09

29 Apr '09

Hello community, here is the log from the commit of package crash for openSUSE:Factory checked in at Wed Apr 29 02:16:14 CEST 2009. -------- --- crash/crash.changes 2009-02-07 19:37:38.000000000 +0100 +++ crash/crash.changes 2009-04-28 12:18:59.000000000 +0200 @@ -1,0 +2,44 @@ +Mon Apr 27 15:35:31 CEST 2009 - ptesarik(a)suse.cz + +- Update to 4.0-8.9 + o NEW: Add option "bt -g" to display the backtraces of all + threads in a thread group + o NEW: Support for kdump "split-dumpfile" format produced by + "makedumpfile --split" + o Fix for "kmem -i", "kmem -n" and "kmem -p" on x86_64 + CONFIG_SPARSEMEM and CONFIG_SPARSEMEM_EXTREME kernels that have + MAX_PHYSMEM_BITS increased from 40 to 44 + o Allow multiple "--machdep option=value" command-line options + o Produce a warning if "bt" is attempted on active, non-crashing, + xen dom0 tasks using kdump dumpfiles + o Fix for potentially empty "bt -t" output, and for "bt -T" + potentially dumping the text return addresses in the hard or + soft IRQ stacks instead of the process stack + +------------------------------------------------------------------- +Mon Apr 21 12:34:08 CEST 2009 - ptesarik(a)suse.cz + +- Update to 4.0-8.8 + o Add the CONFIG_STRICT_DEVMEM hint when reading /dev/mem fails + o Fix segmentation violation in "bt" when reading certain x86_64 + Egenera/LKCD dumpfiles where the starting stack hooks + o Fix the "log" command for cases when the log buffer was cleared + with syslog() or klogctl() + o Improve the error message displayed by "bt -S" when given + a non-process stack address as an argument + o Search directories for the "extend" command in this order: + 1. the current working directory + 2. the directory specified in the CRASH_EXTENSIONS shell + environment variable + 3. /usr/lib64/crash/extensions (64-bit architectures) + 4. /usr/lib/crash/extensions + o Improve how the "bt" command determines which PID 0 swapper + task was interrupted by an ia64 INIT or MCA exception + o Remove an unused initialized variable in get_task_mem_usage() + o Add a debug-level 8 statement in readmem() to display the + current input address and its translated physical address under + the existing debug-level 4 "<readmem: ...>" line +- Delete crash-improve-find-extension.diff: Solved slightly + differently in mainline. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- crash-4.0-7.7.tar.bz2 crash-improve-find-extension.diff New: ---- crash-4.0-8.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crash.spec ++++++ --- /var/tmp/diff_new_pack.S10963/_old 2009-04-29 02:11:34.000000000 +0200 +++ /var/tmp/diff_new_pack.S10963/_new 2009-04-29 02:11:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package crash (Version 4.0.7.7) +# spec file for package crash (Version MACRO) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,6 +17,10 @@ # norootforbuild +%define crash_version 4.0 +%define crash_subversion 8.9 +%define whitepaper_version 2003 +%define scripts_version 2008-02-08 Name: crash %ifarch ppc @@ -26,12 +30,8 @@ %endif Url: http://people.redhat.com/anderson/ Summary: Crash utility for live systems; netdump, diskdump, LKCD or mcore dumpfiles -Version: 4.0.7.7 -Release: 1 -%define crash_version %(echo %{version} | cut -d . -f 1-2) -%define crash_subversion %(echo %{version} | cut -d . -f 3-4) -%define whitepaper_version 2003 -%define scripts_version 2008-02-08 +Version: %{crash_version}.%{crash_subversion} +Release: 10 License: GPL v2 only; GPL v2 or later; LGPL v2.1 or later Group: Development/Tools/Debuggers Source: %{name}-%{crash_version}-%{crash_subversion}.tar.bz2 @@ -43,7 +43,6 @@ Patch0: %{name}-Makefile-ADD_CFLAGS Patch1: %{name}-make-emacs-default.diff Patch2: %{name}-sles9-quirk.patch -Patch3: %{name}-improve-find-extension.diff Patch4: %{name}-sles9-time.patch Patch5: %{name}-compressed-kernel Patch6: %{name}-crosscrash-hint.diff @@ -127,7 +126,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 @@ -158,8 +156,8 @@ chmod 644 COPYING # extensions %if %build_sial -mkdir $RPM_BUILD_ROOT/%{_libdir}/crash -install -m 0644 extensions/sial.so $RPM_BUILD_ROOT/%{_libdir}/crash +mkdir -p $RPM_BUILD_ROOT/%{_libdir}/crash/extensions +install -m 0644 extensions/sial.so $RPM_BUILD_ROOT/%{_libdir}/crash/extensions # scripts mkdir -p $RPM_BUILD_ROOT/%{_datadir}/sial/crash install -m 0644 sial-scripts-%{scripts_version}/*.c \ @@ -187,13 +185,52 @@ %files sial %defattr(-,root,root) %doc extensions/libsial/README -%{_libdir}/crash/sial.so +%{_libdir}/crash/extensions/sial.so %{_datadir}/sial/crash %dir %{_datadir}/sial %dir %{_libdir}/crash +%dir %{_libdir}/crash/extensions %endif %changelog +* Mon Apr 27 2009 ptesarik(a)suse.cz +- Update to 4.0-8.9 + o NEW: Add option "bt -g" to display the backtraces of all + threads in a thread group + o NEW: Support for kdump "split-dumpfile" format produced by + "makedumpfile --split" + o Fix for "kmem -i", "kmem -n" and "kmem -p" on x86_64 + CONFIG_SPARSEMEM and CONFIG_SPARSEMEM_EXTREME kernels that have + MAX_PHYSMEM_BITS increased from 40 to 44 + o Allow multiple "--machdep option=value" command-line options + o Produce a warning if "bt" is attempted on active, non-crashing, + xen dom0 tasks using kdump dumpfiles + o Fix for potentially empty "bt -t" output, and for "bt -T" + potentially dumping the text return addresses in the hard or + soft IRQ stacks instead of the process stack +* Tue Apr 21 2009 ptesarik(a)suse.cz +- Update to 4.0-8.8 + o Add the CONFIG_STRICT_DEVMEM hint when reading /dev/mem fails + o Fix segmentation violation in "bt" when reading certain x86_64 + Egenera/LKCD dumpfiles where the starting stack hooks + o Fix the "log" command for cases when the log buffer was cleared + with syslog() or klogctl() + o Improve the error message displayed by "bt -S" when given + a non-process stack address as an argument + o Search directories for the "extend" command in this order: + 1. the current working directory + 2. the directory specified in the CRASH_EXTENSIONS shell + environment variable + 3. /usr/lib64/crash/extensions (64-bit architectures) + 4. /usr/lib/crash/extensions + o Improve how the "bt" command determines which PID 0 swapper + task was interrupted by an ia64 INIT or MCA exception + o Remove an unused initialized variable in get_task_mem_usage() + o Add a debug-level 8 statement in readmem() to display the + current input address and its translated physical address under + the existing debug-level 4 "<readmem: ...>" line +- Delete crash-improve-find-extension.diff: Solved slightly + differently in mainline. * Sat Feb 07 2009 bwalle(a)suse.de - Update to 4.0-7.7 o Dynamic page size detection on PPC64 and IA64. @@ -659,7 +696,7 @@ o Fix for LKCD dumpfile access failures that abort() the crash session after displaying an error message indicating a problem with physical memory zones in the dumpfile. -* Fri Nov 09 2007 bwalle(a)suse.de +* Sat Nov 10 2007 bwalle(a)suse.de - load extension modules also when the ".so" suffix is not provided * Fri Nov 09 2007 bwalle(a)suse.de - fix compile warnings in the echo (sample) extension @@ -793,7 +830,7 @@ o Fix for s390 and s390x backtrace commands to recognize the kernel structure name change from "runqueue" to "rq". o Merged fourth round of "xencrash" patches -* Tue Apr 10 2007 bwalle(a)suse.de +* Wed Apr 11 2007 bwalle(a)suse.de - update to crash 4.0-3.22 o support for 2.6.20 "__bug_table" o Fix for the x86 backtrace code to recognize the encoded @@ -821,7 +858,7 @@ o Fix for live system analysis of Ubuntu kernels o Fix for 2.6.21 kernels that fail during initialization with the message: "crash: invalid (optional) structure member offsets: -* Wed Feb 21 2007 bwalle(a)suse.de +* Thu Feb 22 2007 bwalle(a)suse.de - update to crash 4.0-3.19 o merged third round of "xencrash" patches o verified support of live system analysis of ia64 xen kernels @@ -968,7 +1005,7 @@ - some ppc64 updates (149714 - LTC21350) * Sat Feb 11 2006 mason(a)suse.de - Update to crash 4.0-2.20 (better fix for x86-64 cpu pda structs) -* Mon Jan 30 2006 mls(a)suse.de +* Tue Jan 31 2006 mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Jan 30 2006 mason(a)suse.de - Update for new x86-64 cpu pda structs ++++++ crash-4.0-7.7.tar.bz2 -> crash-4.0-8.9.tar.bz2 ++++++ crash/crash-4.0-7.7.tar.bz2 crash/crash-4.0-8.9.tar.bz2 differ: byte 11, line 1 ++++++ crash-compressed-kernel ++++++ --- /var/tmp/diff_new_pack.S10963/_old 2009-04-29 02:11:35.000000000 +0200 +++ /var/tmp/diff_new_pack.S10963/_new 2009-04-29 02:11:35.000000000 +0200 @@ -26,10 +26,12 @@ --- defs.h | 3 filesys.c | 1 + defs.h | 3 + filesys.c | 1 kernel.c | 4 - main.c | 24 ++++--- - symbols.c | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- - 5 files changed, 206 insertions(+), 35 deletions(-) + symbols.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- + 5 files changed, 209 insertions(+), 35 deletions(-) * * * Fix segmentation fault @@ -40,10 +42,9 @@ Signed-off-by: Sachin Sant <sachinp(a)in.ibm.com> Acked-by: Bernhard Walle <bwalle(a)suse.de> -diff -r 73c6c45110e8 -r c06f161cde02 defs.h ---- a/defs.h Thu Jan 15 18:26:56 2009 +0100 -+++ b/defs.h Thu Jan 15 18:26:57 2009 +0100 -@@ -305,6 +305,8 @@ +--- a/defs.h 2009-04-17 12:41:50.000000000 +0200 ++++ b/defs.h 2009-04-17 12:41:56.000000000 +0200 +@@ -305,6 +305,8 @@ struct program_context { char *prompt; /* this program's prompt */ unsigned long long flags; /* flags from above */ char *namelist; /* linux namelist */ @@ -52,18 +53,17 @@ char *dumpfile; /* dumpfile or /dev/kmem */ char *live_memsrc; /* live memory driver */ char *system_map; /* get symbol values from System.map */ -@@ -3326,6 +3328,7 @@ +@@ -3327,6 +3329,7 @@ void dump_struct_table(ulong); + void dump_offset_table(char *, ulong); int is_elf_file(char *); - int is_elf_file_silent(char *); int is_kernel(char *); +int is_kernel_uncompress(char *file, char *new_filename); int file_elf_version(char *); int is_system_map(char *); int select_namelist(char *); -diff -r 73c6c45110e8 -r c06f161cde02 filesys.c ---- a/filesys.c Thu Jan 15 18:26:56 2009 +0100 -+++ b/filesys.c Thu Jan 15 18:26:57 2009 +0100 -@@ -585,6 +585,7 @@ +--- a/filesys.c 2009-03-20 16:18:08.000000000 +0100 ++++ b/filesys.c 2009-04-17 12:41:56.000000000 +0200 +@@ -586,6 +586,7 @@ find_booted_kernel(void) if (CRASHDEBUG(1)) fprintf(fp, "find_booted_kernel: found: %s\n", pc->namelist); @@ -71,10 +71,9 @@ return TRUE; } } -diff -r 73c6c45110e8 -r c06f161cde02 kernel.c ---- a/kernel.c Thu Jan 15 18:26:56 2009 +0100 -+++ b/kernel.c Thu Jan 15 18:26:57 2009 +0100 -@@ -3530,10 +3530,10 @@ +--- a/kernel.c 2009-04-17 12:41:50.000000000 +0200 ++++ b/kernel.c 2009-04-17 12:41:56.000000000 +0200 +@@ -3565,10 +3565,10 @@ display_sys_stats(void) if (pc->system_map) { fprintf(fp, " SYSTEM MAP: %s\n", pc->system_map); fprintf(fp, "DEBUG KERNEL: %s %s\n", @@ -87,10 +86,9 @@ } if (pc->debuginfo_file) -diff -r 73c6c45110e8 -r c06f161cde02 main.c ---- a/main.c Thu Jan 15 18:26:56 2009 +0100 -+++ b/main.c Thu Jan 15 18:26:57 2009 +0100 -@@ -313,6 +313,7 @@ +--- a/main.c 2009-04-17 12:41:46.000000000 +0200 ++++ b/main.c 2009-04-17 12:41:56.000000000 +0200 +@@ -314,6 +314,7 @@ main(int argc, char **argv) * Take the kernel and dumpfile arguments in either order. */ while (argv[optind]) { @@ -98,7 +96,7 @@ if (is_remote_daemon(argv[optind])) { if (pc->flags & DUMPFILE_TYPES) { -@@ -325,21 +326,28 @@ +@@ -326,21 +327,28 @@ main(int argc, char **argv) continue; } @@ -108,16 +106,16 @@ - } else if (!is_readable(argv[optind])) + if (!file_exists(argv[optind], NULL)) { + error(INFO, "%s: %s\n", argv[optind], strerror(ENOENT)); -+ program_usage(SHORT_FORM); -+ } else if (!is_readable(argv[optind])) program_usage(SHORT_FORM); - -- if (is_kernel(argv[optind])) { ++ } else if (!is_readable(argv[optind])) ++ program_usage(SHORT_FORM); ++ + if (is_kernel_uncompress(argv[optind], uncompressed_file)) { + char *file = strlen(uncompressed_file) + ? strdup(uncompressed_file) + : argv[optind]; -+ + +- if (is_kernel(argv[optind])) { if (pc->namelist || pc->server_namelist) { - if (!select_namelist(argv[optind])) { + if (!select_namelist(file)) { @@ -135,10 +133,9 @@ } else if (!(pc->flags & KERNEL_DEBUG_QUERY)) { -diff -r 73c6c45110e8 -r c06f161cde02 symbols.c ---- a/symbols.c Thu Jan 15 18:26:56 2009 +0100 -+++ b/symbols.c Thu Jan 15 18:26:57 2009 +0100 -@@ -57,7 +57,7 @@ +--- a/symbols.c 2009-03-20 16:18:08.000000000 +0100 ++++ b/symbols.c 2009-04-17 12:41:56.000000000 +0200 +@@ -57,7 +57,7 @@ static void symname_hash_init(void); static void symname_hash_install(struct syment *); static struct syment *symname_hash_search(char *); static void gnu_qsort(bfd *, void *, long, unsigned int, asymbol *, asymbol *); @@ -147,7 +144,7 @@ static int separate_debug_file_exists(const char *, unsigned long, int *); static int store_module_kallsyms_v1(struct load_module *, int, int, char *); static int store_module_kallsyms_v2(struct load_module *, int, int, char *); -@@ -157,6 +157,14 @@ +@@ -157,6 +157,14 @@ symtab_init(void) if (file_elf_version(pc->namelist) == EV_DWARFEXTRACT) pc->flags |= KERNTYPES; @@ -162,7 +159,7 @@ if (pc->flags & SYSMAP) { bfd_map_over_sections(st->bfd, section_header_info, VERIFY_SECTIONS); -@@ -180,7 +188,7 @@ +@@ -180,7 +188,7 @@ symtab_init(void) */ if (!(LKCD_KERNTYPES()) && !(bfd_get_file_flags(st->bfd) & HAS_SYMS)) { @@ -171,7 +168,7 @@ no_debugging_data(FATAL); } -@@ -231,7 +239,7 @@ +@@ -231,7 +239,7 @@ symtab_init(void) * /usr/lib/debug/boot (since we know it's a Red Hat kernel) */ static int @@ -180,7 +177,7 @@ { int i, exists, found; asection *sect; -@@ -266,16 +274,19 @@ +@@ -266,16 +274,19 @@ check_gnu_debuglink(bfd *bfd) error(NOTE, "gnu_debuglink file: %s\ncrc32: %lx\n", contents, crc32); @@ -204,7 +201,7 @@ for (i = strlen(dirname)-1; i >= 0; i--) { -@@ -380,13 +391,15 @@ +@@ -380,13 +391,15 @@ check_gnu_debuglink(bfd *bfd) reset_bfd: @@ -227,7 +224,7 @@ FREEBUF(contents); FREEBUF(dirname); -@@ -452,17 +465,17 @@ +@@ -452,17 +465,17 @@ no_debugging_data(int error_type) switch (error_type) { case INFO: @@ -248,8 +245,8 @@ clean_exit(1); } } -@@ -2560,27 +2573,148 @@ - +@@ -2533,27 +2546,148 @@ is_elf_file(char *s) + } /* + * Checks if the file is gzip-compressed. Just uses the magic checksum for @@ -367,19 +364,17 @@ */ int -is_kernel(char *file) --{ -- int fd, swap; +is_kernel_uncompress(char *file, char *new_file) -+{ + { +- int fd, swap; + gzFile fp; + int swap, err; char eheader[BUFSIZE]; Elf32_Ehdr *elf32; Elf64_Ehdr *elf64; -- -- if ((fd = open(file, O_RDONLY)) < 0) { + int is_gzipped; -+ + +- if ((fd = open(file, O_RDONLY)) < 0) { + /* + * if the file is gzipped and we cannot extract it, then + * we must say this is no kernel even if it would be one after @@ -406,7 +401,7 @@ if (!STRNEQ(eheader, ELFMAG) || eheader[EI_VERSION] != EV_CURRENT) return FALSE; -@@ -2656,7 +2790,35 @@ +@@ -2629,7 +2763,35 @@ is_kernel(char *file) } bailout: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kaffeine for openSUSE:Factory
by root＠Hilbert.suse.de 29 Apr '09

29 Apr '09

Hello community, here is the log from the commit of package kaffeine for openSUSE:Factory checked in at Wed Apr 29 02:11:23 CEST 2009. -------- --- KDE/kaffeine/kaffeine.changes 2009-04-08 18:06:47.000000000 +0200 +++ kaffeine/kaffeine.changes 2009-04-28 11:53:57.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Apr 28 08:32:10 CEST 2009 - beineri(a)opensuse.org + +- fix build + +------------------------------------------------------------------- +Mon Apr 27 20:55:01 CEST 2009 - tittiatcoke(a)gmail.com + +- update to 1.0-pre1; This is the pre-release of the KDE4 version + and is not really intended yet for end-users + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- adjust-mimetypes.diff cs.po dvbaudio-fix-build.patch dvbdata.tar.gz kaffeine-0.8.7.tar.bz2 kaffeine.diff kaffeine-link.diff kaffeine-media.diff kaffeine-quote-subs.patch kaffeine-tmpobject.diff logo.ogg messagebox-dvd.diff mutex.diff pedantic.diff New: ---- desktop-files.diff kaffeine.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kaffeine.spec ++++++ --- /var/tmp/diff_new_pack.N29475/_old 2009-04-29 01:59:11.000000000 +0200 +++ /var/tmp/diff_new_pack.N29475/_new 2009-04-29 01:59:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kaffeine (Version 0.8.7) +# spec file for package kaffeine (Version 0.9+1.0pre1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,40 +19,20 @@ Name: kaffeine -BuildRequires: cdparanoia kdelibs3-devel xine-devel xine-lib -%if %suse_version > 1001 -BuildRequires: gstreamer010-plugins-base-devel -%else -BuildRequires: gstreamer-plugins-devel -%endif +BuildRequires: libkdepimlibs4-devel Url: http://kaffeine.sourceforge.net/ License: GPL v2 or later Group: Productivity/Multimedia/Video/Players Summary: Xine-Based Multimedia Player -Version: 0.8.7 -Release: 47 -%define rversion %version +Version: 0.9+1.0pre1 +Release: 1 +# http://kaffeine.kde.org/?q=node/22 +Source0: kaffeine.tar.bz2 +Patch: desktop-files.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) -%if %suse_version > 1020 -Requires: %{name}-lang = %{version} -%endif -Provides: kaxtv -Obsoletes: kaxtv -Source0: %name-%rversion.tar.bz2 -Source4: logo.ogg -Source5: cs.po -Source6: dvbdata.tar.gz -Patch0: %name.diff -Patch1: adjust-mimetypes.diff -Patch2: messagebox-dvd.diff -Patch4: mutex.diff -Patch5: kaffeine-media.diff -Patch6: kaffeine-link.diff -Patch8: kaffeine-quote-subs.patch -Patch9: pedantic.diff -Patch10: kaffeine-tmpobject.diff -Patch11: dvbaudio-fix-build.patch +%kde4_runtime_requires +Provides: kde4-kaffeine = 4.2.2.svn951439 +Obsoletes: kde4-kaffeine <= 4.2.2.svn951439 %description Kaffeine plays all files and devices supported by Xine. For example, @@ -65,100 +45,49 @@ -------- J�rgen Kofler <kaffeine(a)gmx.net> -%package gstreamer -License: GPL v2 or later -Group: Productivity/Multimedia/Video/Players -Summary: Multimedia Player using Gstreamer - -%description gstreamer -This plugin enables Kaffeine to play via the Gstreamer framework -instead of Xine. - -The gstreamer backend can only get used for the visualization of audio -sources. - - - -Authors: --------- - J�rgen Kofler <kaffeine(a)gmx.net> - -%lang_package %prep -%setup -q -n %name-%rversion +%setup -q -n kaffeine %patch -%patch1 -%patch2 -%patch4 -#%patch5 -%patch6 -%patch8 -%patch9 -%patch10 -%patch11 -cp %SOURCE5 po/ -. /etc/opt/kde3/common_options -update_admin %build -. /etc/opt/kde3/common_options -./configure $configkde --disable-final -make %{?jobs:-j%jobs} -cp %{SOURCE6} images + %cmake_kde4 -d build + %make_jobs %install -. /etc/opt/kde3/common_options -make DESTDIR=${RPM_BUILD_ROOT} $INSTALL_TARGET -# -install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/opt/kde3/share/apps/kaffeine/logo.avi -# -r to get rid of Music -%suse_update_desktop_file -r kaffeine KDE AudioVideo Player Video -rm -rf $RPM_BUILD_ROOT/opt/kde3/share/locale/xx -rm $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/x-mplayer2.desktop -kde_post_install -%find_lang %name - -%post -%run_ldconfig - -%postun -%run_ldconfig -%if %suse_version > 1020 + pushd build + %makeinstall + popd + rm -rf $RPM_BUILD_ROOT/usr/share/locale/x-test + %suse_update_desktop_file kaffeine KDE AudioVideo Player Video + %kde_post_install + %find_lang kaffeine -%files lang -f %name.lang +%post -p /sbin/ldconfig -%files -%else +%postun -p /sbin/ldconfig -%files -f %name.lang -%endif -%defattr(-,root,root) -/opt/kde3/bin/* -/opt/kde3/include/kaffeine -/opt/kde3/%_lib/lib* -/opt/kde3/%_lib/kde3/libxinepart.* -/opt/kde3/%_lib/kde3/libkaffeineoggvorbis.* -/opt/kde3/share/appl*/*/* -/opt/kde3/share/apps/kaffeine -/opt/kde3/share/apps/konqueror -/opt/kde3/share/apps/profiles -/opt/kde3/share/icons/* -/opt/kde3/share/mimelnk/*/*.desktop -/opt/kde3/share/services/xine_part.desktop -/opt/kde3/share/services/kaffeineoggvorbis.desktop -/opt/kde3/share/servicetypes/kaffeineaudioencoder.desktop -/opt/kde3/share/servicetypes/kaffeinedvbplugin.desktop -/opt/kde3/share/servicetypes/kaffeineepgplugin.desktop +%clean +rm -rf $RPM_BUILD_ROOT -%files gstreamer +%files -f kaffeine.lang %defattr(-,root,root) -%if %suse_version > 1000 -/opt/kde3/%_lib/kde3/libgstreamerpart.* -/opt/kde3/share/apps/gstreamerpart -/opt/kde3/share/services/gstreamer_part.desktop -%endif +/usr/bin/kaffeine +%_kde_share_dir/apps/kaffeine +/usr/share/applications/kde4/kaffeine.desktop +%dir %_kde_share_dir/apps/solid +%dir %_kde_share_dir/apps/solid/actions +%_kde_share_dir/apps/solid/actions/kaffeine_play_audiocd.desktop +%_kde_share_dir/apps/solid/actions/kaffeine_play_dvd.desktop +%_kde_share_dir/apps/solid/actions/kaffeine_play_videocd.desktop +/usr/share/icons/oxygen/*/actions/audio-radio-encrypted.* +/usr/share/icons/oxygen/*/actions/video-television-encrypted.* %changelog +* Tue Apr 28 2009 beineri(a)opensuse.org +- fix build +* Mon Apr 27 2009 tittiatcoke(a)gmail.com +- update to 1.0-pre1; This is the pre-release of the KDE4 version + and is not really intended yet for end-users * Wed Apr 08 2009 llunak(a)suse.cz - fix build due to uint16_t * Mon Jul 07 2008 dmueller(a)suse.de ++++++ desktop-files.diff ++++++ --- src/kaffeine.desktop 2009/04/28 06:18:54 1.1 +++ src/kaffeine.desktop 2009/04/28 06:23:47 @@ -45,7 +45,6 @@ GenericName[x-test]=xxMedia Playerxx GenericName[zh_CN]=媒体播放器 Categories=Qt;KDE;AudioVideo;Player; -Icon=kaffeine MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-mplayer2;application/x-quicktime-media-link;application/x-shorten;audio/ac3;audio/basic;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-flac;audio/x-it;audio/x-m4b;audio/x-matroska;audio/x-mod;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-speex;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-wav;audio/x-wavpack;audio/x-xm;video/dv;video/mp4;video/mpeg;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-anim;video/x-flic;video/x-flv;video/x-matroska;video/x-mng;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-ogm+ogg; Terminal=false Type=Application ++++++ kaffeine-0.8.7.tar.bz2 -> kaffeine.tar.bz2 ++++++ ++++ 392451 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 OpenOffice_org-extensions for openSUSE:Factory
by root＠Hilbert.suse.de 28 Apr '09

28 Apr '09

Hello community, here is the log from the commit of package OpenOffice_org-extensions for openSUSE:Factory checked in at Wed Apr 29 01:58:16 CEST 2009. -------- --- OpenOffice_org-extensions/OpenOffice_org-extensions.changes 2009-04-17 17:44:01.000000000 +0200 +++ OpenOffice_org-extensions/OpenOffice_org-extensions.changes 2009-04-24 14:01:52.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Apr 24 13:48:09 CEST 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo310-m10 +- updated ooo-build to version 3.0.99.6 (3.1-beta6) +- updated extra localization sources: be-BY, bg, cs, da, el, et, fi, ga, km, + lt, mk, sk, sl + +------------------------------------------------------------------- +Mon Apr 20 15:37:02 CEST 2009 - pmladek(a)suse.cz + +- removed obsolete scsolver extension +- removed obsolete lpsolve-devel from BuildRequires +- added README-scsolver.txt + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m9-extensions.tar.bz2 scsolver.2008-10-30.tar.bz2 New: ---- ooo310-m10-extensions.tar.bz2 README-scsolver.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-extensions.spec ++++++ --- /var/tmp/diff_new_pack.t10050/_old 2009-04-29 01:57:20.000000000 +0200 +++ /var/tmp/diff_new_pack.t10050/_new 2009-04-29 01:57:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-extensions (Version 3.0.99.5) +# spec file for package OpenOffice_org-extensions (Version 3.0.99.6) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-extensions -Version: 3.0.99.5 +Version: 3.0.99.6 Release: 1 -%define ooo_build_version 3.0.99.5 +%define ooo_build_version 3.0.99.6 %define piece extensions #!BuildIgnore: OpenOffice_org BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel db-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel kdelibs3-devel krb5 libexif mono-devel neon-devel openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel python-xml recode unixODBC-devel unzip xml-commons-apis xorg-x11 zip @@ -34,13 +34,9 @@ %if %suse_version >= 1100 BuildRequires: libpoppler-devel %endif -%if %suse_version > 1100 -# lpsolve-devel has been available since openSUSE-11.1 -BuildRequires: lpsolve-devel -%endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m9 +%define ooo_build_tag ooo310-m10 License: LGPL v2.1 or later; LGPL v3 only; Other uncritical OpenSource License; The Apache Software License Group: Productivity/Office/Suite AutoReqProv: on @@ -49,7 +45,7 @@ Url: http://extensions.services.openoffice.org Source0: %ooo_build_tag-%piece.tar.bz2 Source1: ooo-sdf-%piece.tar.bz2 -Source2: scsolver.2008-10-30.tar.bz2 +Source2: README-scsolver.txt BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc @@ -158,18 +154,6 @@ # clear disk cache unopkg list --shared > /dev/null 2>&1 || true fi - -%post -n OpenOffice_org-calc-extensions -echo "Registering OpenOffice.org Calc extensions..." -unopkg add --shared --force %ooo_prefix/%ooo_home/share/extension/install/scsolver.uno.oxt || true; - -%preun -n OpenOffice_org-calc-extensions -if test $1 = 0 ; then - echo "Unregistering OpenOffice.org Calc extensions..." - unopkg remove --shared org.go-oo.CalcSolver || true; - # clear disk cache - unopkg list --shared > /dev/null 2>&1 || true -fi # draw %pre -n OpenOffice_org-draw-extensions @@ -238,7 +222,8 @@ fi %prep -%setup -q -a1 -a2 -n %ooo_build_tag-%piece +%setup -q -a1 -n %ooo_build_tag-%piece +cp %{S:2} . %build # setup env. @@ -264,7 +249,7 @@ %files -n OpenOffice_org-calc-extensions %defattr(-,root,root) -%ooo_prefix/%ooo_home/share/extension/install/scsolver.uno.oxt +%doc README-scsolver.txt %files -n OpenOffice_org-draw-extensions %defattr(-,root,root) @@ -280,6 +265,15 @@ %ooo_prefix/%ooo_home/share/extension/install/wiki-publisher.oxt %changelog +* Fri Apr 24 2009 pmladek(a)suse.cz +- updated to the milestone ooo310-m10 +- updated ooo-build to version 3.0.99.6 (3.1-beta6) +- updated extra localization sources: be-BY, bg, cs, da, el, et, fi, ga, km, + lt, mk, sk, sl +* Mon Apr 20 2009 pmladek(a)suse.cz +- removed obsolete scsolver extension +- removed obsolete lpsolve-devel from BuildRequires +- added README-scsolver.txt * Fri Apr 17 2009 pmladek(a)suse.cz - updated ooo-build to version 3.0.99.5 (3.1-beta5) * Wed Apr 08 2009 pmladek(a)suse.cz ++++++ ooo310-m9-extensions.tar.bz2 -> ooo310-m10-extensions.tar.bz2 ++++++ OpenOffice_org-extensions/ooo310-m9-extensions.tar.bz2 OpenOffice_org-extensions/ooo310-m10-extensions.tar.bz2 differ: byte 11, line 1 ++++++ ooo-sdf-extensions.tar.bz2 ++++++ ++++ 4282 lines of diff (skipped) ++++++ README-scsolver.txt ++++++ Dear customer, the "Optimization Solver for Calc" extension is not longer part of the package. The author discontinued its development in favor of the upstream version. Thanks for understanding. Have a good experience with the upstream solver, Your openSUSE team ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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