commit DirectFB.3723 for openSUSE:13.2:Update
Hello community, here is the log from the commit of package DirectFB.3723 for openSUSE:13.2:Update checked in at 2015-04-30 14:44:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/DirectFB.3723 (Old) and /work/SRC/openSUSE:13.2:Update/.DirectFB.3723.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "DirectFB.3723" Changes: -------- New Changes file: --- /dev/null 2015-04-29 01:05:10.436023256 +0200 +++ /work/SRC/openSUSE:13.2:Update/.DirectFB.3723.new/DirectFB.changes 2015-04-30 14:44:51.000000000 +0200 @@ -0,0 +1,615 @@ +------------------------------------------------------------------- +Thu Apr 23 07:45:23 UTC 2015 - pgajdos@suse.com + +- security update + * CVE-2014-2977 [bnc#878345] + + DirectFB-CVE-2014-2977.patch + * CVE-2014-2978 [bnc#878349] + + DirectFB-CVE-2014-2978.patch + +------------------------------------------------------------------- +Mon Aug 18 09:14:09 UTC 2014 - pgajdos@suse.com + +- also do not build omap driver [bnc#860256] (internal) + +------------------------------------------------------------------- +Wed Jul 30 14:53:51 UTC 2014 - pgajdos@suse.com + +- baselibs.conf again + +------------------------------------------------------------------- +Wed Jul 30 14:47:36 UTC 2014 - pgajdos@suse.com + +- do not build nsc driver (unclear license, outdated) + [bnc#860256] (internal) + +------------------------------------------------------------------- +Tue Jul 29 07:54:40 UTC 2014 - pgajdos@suse.com + +- update to version 1.7.5: + * libdirect: Fix deadlock using a fallback flag for removing a + signal handler. + * Core: Fix order of CoreSystemFuncs initialisation + * API: Add DSPF_ARGB8565 and DSPF_ABGR to DFB_COLOR_IS_RGB + * etc. see ChangeLog + +------------------------------------------------------------------- +Tue Apr 29 09:10:11 UTC 2014 - pgajdos@suse.com + +- update to version 1.7.4: + * SaWMan: Fix shutdown crash with slave processes exiting with + master + +------------------------------------------------------------------- +Thu Apr 10 09:25:37 UTC 2014 - p.drouand@gmail.com + +- Update baselibs.conf too + +------------------------------------------------------------------- +Wed Apr 9 10:11:29 UTC 2014 - p.drouand@gmail.com + +- Update to version 1.7.3 + + Read the ChangeLog for more news +- Adapt DirectFB-1.7.1-drop-test_foo.patch to upstream changes + +------------------------------------------------------------------- +Thu Dec 19 10:27:04 UTC 2013 - mvyskocil@suse.com + +- correct baselibs.conf + +------------------------------------------------------------------- +Wed Dec 18 10:19:46 UTC 2013 - mvyskocil@suse.com + +- Update to 1.7.1 + * API + + Add 4k display resolution. + + Add alternative UHDTV mode. + * API | C++ + + Add convenience classes like DFBRectangle to new header file + <directfb++.h>, fix dynamic cast with NULL pointer + * Options + + Add 'nm-for-trace' option that must be used to run + 'nm' at trace dump (as done before). Add D_ARGS env as + input to libdirect's config_init (constructor). + * And many bugfixes and refactoring + 1.7.0: + * task-manager allows to automatically distribute + rendering tasks over multiple cpu and/or gpu cores + * Merged Projects: + + DirectFB-extra (missing bits) + + SaWMan + + FusionDale + + FusionSound + + DiVine + + ++dfb (packaged in separate lib++dfb-1_7-1 and lib++dfb-devel packages) + * New APIs + + Add IDirectFBSurface::DumpRaw() to dump raw pixel data of a surface to a file + + Add IDirectFBSurface::GetFrameTime() to receive the timestamp for the next + frame to be rendered + Add IDirectFBSurface::SetFrameTimeConfig() to + configure GetFrameTime() + + Add IDirectFBVideoProvider::SetDestination() to change the destination + surface and/or destination rectangle during playback + * New System Module drm/kms + * New ImageProviders + + WebP + + tiff + * Tons of bugfixes and performance improvements... +- build with more features - timidity, vorbis, cddb, drm, kms, jasper, wepb, + rsvg and imlib2 +- refreshed/rebased + * DirectFB-1.6.1-lm.patch + * DirectFB-int.patch +- added patches + * DirectFB-1.7.1-drop-test_foo.patch, drop a test, which can't be compiled + +------------------------------------------------------------------- +Tue Aug 13 09:37:00 UTC 2013 - mvyskocil@suse.com + +- Enable X11/vdpau + +------------------------------------------------------------------- +Wed Aug 7 11:45:16 UTC 2013 - guillaume@opensuse.org + +- Enable openGL ES 2 support (Mesa only) + +------------------------------------------------------------------- +Wed Aug 7 10:07:03 UTC 2013 - guillaume@opensuse.org + +- Add omap support (ARM) + +------------------------------------------------------------------- +Wed Aug 7 10:06:44 UTC 2013 - guillaume@opensuse.org + +- Enable tslib support for openSUSE 13.1+ + +------------------------------------------------------------------- +Mon Jun 17 12:22:44 UTC 2013 - p.drouand@gmail.com + +- Update to version 1.6.3. There is a large list of changes + see Changelog for details +- Remove DirectFB-1.6.1-mesa-libgbm-stridefix.patch; fixed by upstream + +------------------------------------------------------------------- +Fri Mar 15 10:20:14 UTC 2013 - coolo@suse.com + +- use original tar as source url + +------------------------------------------------------------------- +Fri Dec 21 11:30:05 UTC 2012 - dvaleev@suse.com + +- Fix cyber5k and radeon drivers build on powerpc + (DirectFB-setregion.patch) + +------------------------------------------------------------------- +Tue Dec 18 10:02:38 UTC 2012 - mvyskocil@suse.com + +- remove unused files + * 85-directfb.rules + * DirectFB-1.5.3-lm.patch + * DirectFB-1.6.1-fix-Wimplicit-function-declaration-cflags-error.patch + * DirectFB-1.7.11.3-mesa-libgbm-stridefix.patch + +------------------------------------------------------------------- +Thu Dec 6 21:36:32 UTC 2012 - joop.boonen@opensuse.org + +- Only apply patch DirectFB-1.6.1-mesa-libgbm-stridefix.patch on + openSUSE > 12.2 + +------------------------------------------------------------------- +Mon Oct 22 16:20:07 UTC 2012 - p.drouand@gmail.com + +- Update to 1.6.2 version : + * IDirectFB + - When creating a windowed primary, translate + window-surface-policy option to DSCAPS_SYSTEMONLY/VIDEOONLY. + * Core + - Stub out Core_Push/Pop/GetCalling in case of single app build, thanks to Mike Nelis! + - Temporary solution for permissions not being granted to a surface from GetSurface(). + - prevent segfault when calls are launched from non-dfb threads. + - Reset flip counter to zero when changing buffer mode. + - When creating a window pass through DSCAPS_GL. + * Util + - Add dfb_regions_unite() to calculate bounds of one or more regions. + * Genefx + - Avoid division by zero with rotation and formats < 1 byte per pixel. + * gfxutil + - Avoid double premultiplication when loading an image scaled. + * One + - Use direct_list_foreach_safe() when iterating through receiving list. + - In OneAppTarget_Destroy() remove from receiving list if needed. + * fonts + - Make x and y advances 24.8 fixed point to fix font rotation. + * X11 + - Set max value for absolute motion events. + * EGL + - Support ARGB directly in fboWrite(), add fboRead(). + * Android + - Use sawman wm. + - Force quit by segfaulting on purpose. + * Video Provider + - Add WIP gstreamer video provider. + * Tools + - dfbg: Add option '-p' to create a surface with DSCAPS_PREMULTIPLIED. +- Update baselibs.conf + +------------------------------------------------------------------- +Thu Sep 27 08:59:42 UTC 2012 - idonmez@suse.com + ++++ 418 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.2:Update/.DirectFB.3723.new/DirectFB.changes New: ---- DirectFB-0.9.24-matroxi2c.diff DirectFB-0.9.24-warning.patch DirectFB-1.2.9-headers.patch DirectFB-1.2.9-ignore-fbmodes.patch DirectFB-1.5.3-add-missing-davinci-files.patch DirectFB-1.5.3-fix_v4l1.patch DirectFB-1.5.3-vdpau.patch DirectFB-1.6.1-FusionID-fix-git21c3684.patch DirectFB-1.6.1-gcc-atomics-on-arm.patch DirectFB-1.6.1-lm.patch DirectFB-1.7.0-int.patch DirectFB-1.7.3-drop-test_foo.patch DirectFB-1.7.5.tar.gz DirectFB-CVE-2014-2977.patch DirectFB-CVE-2014-2978.patch DirectFB-cc-cflags.patch DirectFB-setregion.patch DirectFB.changes DirectFB.spec baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ DirectFB.spec ++++++ # # spec file for package DirectFB # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %global directfbdir %{_libdir}/directfb-1.7-5 %global libdirectfb libdirectfb-1_7-5 %global libdfb lib++dfb-1_7-5 Name: DirectFB Version: 1.7.5 Release: 0 Summary: Graphics Library for Framebuffer Devices License: LGPL-2.1+ Group: System/Libraries Url: http://www.directfb.org/ Source: http://www.directfb.org/downloads/Core/DirectFB-1.7/%{name}-%{version}.tar.gz Source2: baselibs.conf # PATCH-FIX-UPSTREAM Patch2: DirectFB-0.9.24-matroxi2c.diff # PATCH-FIX-UPSTREAM Patch3: DirectFB-1.2.9-headers.patch # PATCH-FIX-UPSTREAM Patch4: DirectFB-cc-cflags.patch # PATCH-FIX-UPSTREAM Patch5: DirectFB-1.7.0-int.patch # PATCH-FIX-UPSTREAM Patch6: DirectFB-0.9.24-warning.patch # PATCH-FIX-UPSTREAM Patch11: DirectFB-1.2.9-ignore-fbmodes.patch # PATCH-FIX-UPSTREAM pngtoico-libpng15.patch -- pgajdos@suse.com; build with libpng15; sent today to andi@directfb.org # build against libpng14 should not be affected, otherwise please let me know Patch12: DirectFB-1.5.3-fix_v4l1.patch # PATCH-FIX-UPSTREAM Patch13: DirectFB-1.6.1-lm.patch # PATCH-FIX-UPSTREAM Patch14: DirectFB-1.6.1-gcc-atomics-on-arm.patch # PATCH-FIX-UPSTREAM Patch15: DirectFB-1.5.3-add-missing-davinci-files.patch # PATCH-FIX-UPSTREAM Patch16: DirectFB-1.5.3-vdpau.patch # PATCH-FIX-UPSTREAM Patch19: DirectFB-1.6.1-FusionID-fix-git21c3684.patch # PATCH-FIX-OPENSUSE DirectFB-setregion.patch -- dvaleev@suse.com; fixes cyber5k and readeon drivers build on powerpc Patch20: DirectFB-setregion.patch # PATCH-FIX_OPENSUSE drop test_foo as it does not build in 1.7, mvyskocil@suse.com Patch21: DirectFB-1.7.3-drop-test_foo.patch Patch22: DirectFB-CVE-2014-2977.patch Patch23: DirectFB-CVE-2014-2978.patch BuildRequires: LibVNCServer-devel %if 0%{?suse_version} > 1220 # Mesa-lib* available only in 12.2+ # but build fail with 12.2 BuildRequires: Mesa-devel BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGLESv2-devel %endif BuildRequires: SDL-devel BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: imlib2-devel BuildRequires: libcddb-devel BuildRequires: libdrm-devel BuildRequires: libjasper-devel BuildRequires: libjpeg-devel BuildRequires: libkms-devel BuildRequires: libpng-devel BuildRequires: librsvg-devel BuildRequires: libstdc++-devel BuildRequires: libtiff-devel BuildRequires: libtimidity-devel BuildRequires: libv4l-devel BuildRequires: libvdpau-devel BuildRequires: libvorbis-devel BuildRequires: libwebp-devel BuildRequires: sysfsutils-devel %if 0%{?suse_version} > 1230 # TSLib not available for 12.3 and previous BuildRequires: tslib-devel %endif BuildRequires: udev BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libXext-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %ifnarch s390 s390x BuildRequires: i2c-tools %endif # bug437293 %ifarch ppc64 Obsoletes: DirectFB-64bit %endif %description DirectFB is a thin library that provides hardware graphics acceleration, input device handling and abstraction, an integrated windowing system with support for translucent windows, and multiple display layers on top of the Linux framebuffer device. It is a complete hardware abstraction layer with software fallbacks for every graphics operation that is not supported by the underlying hardware. DirectFB adds graphical power to embedded systems and sets a new standard for graphics under Linux. %package -n %libdirectfb Summary: Graphics Library for Framebuffer Devices Group: System/Libraries %description -n %libdirectfb DirectFB is a thin library that provides hardware graphics acceleration, input device handling and abstraction, an integrated windowing system with support for translucent windows, and multiple display layers on top of the Linux framebuffer device. It is a complete hardware abstraction layer with software fallbacks for every graphics operation that is not supported by the underlying hardware. DirectFB adds graphical power to embedded systems and sets a new standard for graphics under Linux. %package -n %libdfb Summary: Graphics Library for Framebuffer Devices Group: System/Libraries %description -n %libdfb DirectFB is a thin library that provides hardware graphics acceleration, input device handling and abstraction, an integrated windowing system with support for translucent windows, and multiple display layers on top of the Linux framebuffer device. It is a complete hardware abstraction layer with software fallbacks for every graphics operation that is not supported by the underlying hardware. DirectFB adds graphical power to embedded systems and sets a new standard for graphics under Linux. %package devel Summary: Graphics Library for Framebuffer Devices Group: Development/Libraries/C and C++ Requires: %libdirectfb = %{version} Requires: /bin/sh Requires: glibc-devel Requires: zlib-devel %description devel Development files (headers, so files, pkg-config, documentation) for %{name}. %package -n lib++dfb-devel Summary: C++ Bindings for %{name} Group: Development/Libraries/C and C++ Requires: %libdfb = %{version} Requires: %{name}-devel = %{version} Requires: /bin/sh Requires: glibc-devel Requires: zlib-devel %description -n lib++dfb-devel Development files (headers, so files, pkg-config, documentation) for C++ bindings for %{name}. %package doc Summary: Graphics Library for Framebuffer Devices Documentation Group: System/Libraries %description doc Graphics Library for Framebuffer Devices Documentation in html form. %package libSDL Summary: SDL backend of Graphics Library for Framebuffer Devices Group: System/Libraries Supplements: packageand(%{name}:libSDL) %description libSDL SDL backend of Graphics Library for Framebuffer Devices: * gfxdrivers/libdirectfb_sdlgraphics.so * inputdrivers/libdirectfb_sdlinput.so * systems/libdirectfb_sdl.so %package Mesa Summary: Mesa backend of Graphics Library for Framebuffer Devices Group: System/Libraries Supplements: packageand(%{name}:Mesa) %description Mesa Mesa backend of Graphics Library for Framebuffer Devices: * gfxdrivers/libdirectfb_gl.so * systems/libdirectfb_x11.so %package libvncclient Summary: Mesa backend of Graphics Library for Framebuffer Devices Group: System/Libraries Supplements: packageand(%{name}:libvncclient) %description libvncclient VNC backend of Graphics Library for Framebuffer Devices: * systems/libdirectfb_vnc.so %prep %setup -q # to make fastre working mv patches _patches %patch2 -p1 %patch3 %patch4 -p1 %patch5 -p1 %patch6 #%patch8 %patch11 -p1 %patch12 -p1 -b .fix_v4l1 %patch13 -p1 -b .lm %patch14 -p1 -b .arm-atomics %patch15 -p1 -b .davinci %patch16 -p1 -b .vdpau %patch19 -p1 -b .fusionID %patch20 -p1 %patch21 -p1 %patch22 %patch23 #Disable ppc asm since compilation fails (and it seems better to use glibc) sed -i.noppcasm -e 's/want_ppcasm=yes/want_ppcasm=no/'g configure.in configure # Fix file-not-utf8 for i in ChangeLog README NEWS AUTHORS ; do cp -pr $i $i.not-utf8 iconv -f ISO_8859-1 -t UTF8 $i.not-utf8 > $i touch -r $i.not-utf8 $i rm $i.not-utf8 done #Remove old headers rm interfaces/IDirectFBVideoProvider/{videodev.h,videodev2.h} #FIXME: mvyskocil - can't compile test_foo.c due missing region->context rm wm/unique/test_foo.c %build # move things back mv _patches patches %ifarch s390 s390x sed 's/-O3/-Os/' configure >c;chmod +x c;mv c configure; %endif %{configure} --enable-sdl --with-pic --enable-video4linux2 \ --enable-zlib \ %ifarch x86_64 --enable-mmx \ --enable-sse \ %endif %ifarch ppc64 ppc --with-gfxdrivers="ati128 cle266 cyber5k gl i810 mach64 matrox neomagic nvidia pxa3xx radeon sis315 tdfx unichrome" \ %endif %ifarch s390 s390x --with-gfxdrivers=none --with-inputdrivers=none --disable-video4linux --disable-fbdev \ %endif %ifarch %arm --with-gfxdrivers="gl gles2 nvidia" \ %endif %ifarch %{ix86} x86_64 --with-gfxdrivers="ati128 ep9x gles2 i810 i830 mach64 matrox neomagic nvidia pxa3xx sis315 tdfx vdpau gl" \ %endif --enable-x11 \ --enable-unique \ --with-smooth-scaling \ --disable-gettid # Remove rpath for 64bit sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install find %{buildroot} -name '*.la' -type f -delete #Fix some relative fonts for dfbinspector.c # ln -s ../fonts/dejavu/DejaVuSans.ttf %{buildroot}%{_datadir}/%{name}-%{version}/decker.ttf %check make check %{?_smp_mflags} %post -n %libdirectfb -p /sbin/ldconfig %postun -n %libdirectfb -p /sbin/ldconfig %post -n %libdfb -p /sbin/ldconfig %postun -n %libdfb -p /sbin/ldconfig %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_datadir}/directfb-%{version} %{_bindir}/dfbg %{_bindir}/dfbdump %{_bindir}/dfbdumpinput %{_bindir}/dfbinfo %{_bindir}/dfblayer %{_bindir}/dfbplay %{_bindir}/dfbshow %{_bindir}/dfbswitch %{_bindir}/directfb-csource %{_bindir}/dfbscreen %{_bindir}/dfbinspector %{_bindir}/dfbmaster %{_bindir}/dfbfx %{_bindir}/uwmdump %{_bindir}/dfbinput %{_bindir}/dfbpenmount %{_bindir}/directfb-config %{_bindir}/mkdgifft %ifnarch %arm s390 s390x %{_bindir}/pxa3xx_dump %endif %{_bindir}/mkd*iff %doc %{_mandir}/man1/dfbg.1.gz %doc %{_mandir}/man1/directfb-csource.1.gz %doc %{_mandir}/man5/directfbrc.5.gz %files -n %libdirectfb %defattr(-,root,root) %doc COPYING %{_libdir}/libdirect*.so.* %{_libdir}/libfusion*.so.* %{_libdir}/libuniquewm*.so.* %{directfbdir} %exclude %{directfbdir}/gfxdrivers/libdirectfb_sdlgraphics.so %exclude %{directfbdir}/inputdrivers/libdirectfb_sdlinput.so %exclude %{directfbdir}/systems/libdirectfb_sdl.so %ifnarch s390 s390x %exclude %{directfbdir}/gfxdrivers/libdirectfb_gl.so %endif %exclude %{directfbdir}/systems/libdirectfb_x11.so %exclude %{directfbdir}/systems/libdirectfb_vnc.so %files devel %defattr(-,root,root) %{_libdir}/libdirect*.so %{_libdir}/libfusion*.so %{_libdir}/libuniquewm*.so %{_includedir}/directfb-internal %{_includedir}/directfb %{_libdir}/pkgconfig/directfb-internal.pc %{_libdir}/pkgconfig/directfb.pc %{_libdir}/pkgconfig/direct.pc %{_libdir}/pkgconfig/fusion.pc %files -n %libdfb %defattr(-,root,root) %doc COPYING %{_libdir}/lib++dfb-1.7.so.* %files -n lib++dfb-devel %defattr(-,root,root) %{_libdir}/lib++dfb.so %{_includedir}/++dfb %{_libdir}/pkgconfig/++dfb.pc %files doc %defattr(-,root,root) %doc docs/html/*.html %doc docs/html/*.png %files libSDL %defattr(-,root,root) %{directfbdir}/gfxdrivers/libdirectfb_sdlgraphics.so %{directfbdir}/inputdrivers/libdirectfb_sdlinput.so %{directfbdir}/systems/libdirectfb_sdl.so %files Mesa %defattr(-,root,root) %ifnarch s390 s390x %{directfbdir}/gfxdrivers/libdirectfb_gl.so %endif %{directfbdir}/systems/libdirectfb_x11.so %files libvncclient %defattr(-,root,root) %{directfbdir}/systems/libdirectfb_vnc.so %changelog ++++++ DirectFB-0.9.24-matroxi2c.diff ++++++ --- DirectFB-1.0.1/gfxdrivers/matrox/i2c-userspace.h +++ DirectFB-1.0.1/gfxdrivers/matrox/i2c-userspace.h @@ -0,0 +1,66 @@ +#ifndef I2C_USERSPACE_H +#define I2C_USERSPACE_H +/* copied from i2c-dev.h,i2c.h */ + +#define I2C_SLAVE 0x0703 /* Change slave address */ + /* Attn.: Slave address is 7 or 10 bits */ +#define I2C_SMBUS 0x0720 /* SMBus-level access */ +/* smbus_access read or write markers */ +#define I2C_SMBUS_READ 1 +#define I2C_SMBUS_WRITE 0 +/* SMBus transaction types (size parameter in the above functions) + Note: these no longer correspond to the (arbitrary) PIIX4 internal codes! */ +#define I2C_SMBUS_QUICK 0 +#define I2C_SMBUS_BYTE 1 +#define I2C_SMBUS_BYTE_DATA 2 +#define I2C_SMBUS_WORD_DATA 3 +#define I2C_SMBUS_PROC_CALL 4 +#define I2C_SMBUS_BLOCK_DATA 5 +#define I2C_SMBUS_I2C_BLOCK_DATA 6 +#define I2C_SMBUS_BLOCK_PROC_CALL 7 /* SMBus 2.0 */ +#define I2C_SMBUS_BLOCK_DATA_PEC 8 /* SMBus 2.0 */ +#define I2C_SMBUS_PROC_CALL_PEC 9 /* SMBus 2.0 */ +#define I2C_SMBUS_BLOCK_PROC_CALL_PEC 10 /* SMBus 2.0 */ +#define I2C_SMBUS_WORD_DATA_PEC 11 /* SMBus 2.0 */ + +#define I2C_SMBUS_BLOCK_MAX 32 /* As specified in SMBus standard */ +#define I2C_SMBUS_I2C_BLOCK_MAX 32 /* Not specified but we use same structure */ + + +union i2c_smbus_data { + __u8 byte; + __u16 word; + __u8 block[I2C_SMBUS_BLOCK_MAX + 3]; /* block[0] is used for length */ + /* one more for read length in block process call */ + /* and one more for PEC */ +}; + +static inline __s32 i2c_smbus_access(int file, char read_write, __u8 command, + int size, union i2c_smbus_data *data) +{ + struct i2c_smbus_ioctl_data args; + + args.read_write = read_write; + args.command = command; + args.size = size; + args.data = data; + return ioctl(file,I2C_SMBUS,&args); +} +static inline __s32 i2c_smbus_write_byte_data(int file, __u8 command, + __u8 value) +{ + union i2c_smbus_data data; + data.byte = value; + return i2c_smbus_access(file,I2C_SMBUS_WRITE,command, + I2C_SMBUS_BYTE_DATA, &data); +} +static inline __s32 i2c_smbus_write_word_data(int file, __u8 command, + __u16 value) +{ + union i2c_smbus_data data; + data.word = value; + return i2c_smbus_access(file,I2C_SMBUS_WRITE,command, + I2C_SMBUS_WORD_DATA, &data); +} + +#endif --- DirectFB-1.0.1/gfxdrivers/matrox/matrox_maven.c +++ DirectFB-1.0.1/gfxdrivers/matrox/matrox_maven.c @@ -34,7 +34,7 @@ #include <errno.h> #include <dirent.h> -#include <linux/i2c.h> +//#include <linux/i2c.h> #include <linux/i2c-dev.h> #include <directfb.h> @@ -51,6 +51,10 @@ #include "matrox_maven.h" #define SYS_CLASS_I2C_DEV "/sys/class/i2c-dev" +#ifndef I2C_SLAVE +#include "i2c-userspace.h" +#endif + static void maven_write_byte( MatroxMavenData *mav, ++++++ DirectFB-0.9.24-warning.patch ++++++ --- tests/direct_test.c +++ tests/direct_test.c: @@ -58,6 +58,7 @@ DirectLogType log_type = DLT_STDERR; const char *log_param = NULL; DirectLog *log; + void * discard; for (i=1; i<argc; i++) { @@ -91,7 +92,7 @@ /* Test memory leak detector by not freeing this one. */ - D_MALLOC( 1351 ); + discard = D_MALLOC( 1351 ); D_INFO( "Direct/Test: Application starting...\n" ); ++++++ DirectFB-1.2.9-headers.patch ++++++ Index: systems/fbdev/fbdev.c =================================================================== --- systems/fbdev/fbdev.c.orig 2009-11-24 14:54:14.099489693 +0100 +++ systems/fbdev/fbdev.c 2009-11-24 14:54:27.374488970 +0100 @@ -43,6 +43,7 @@ #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/kd.h> +#undef _LINUX_TYPES_H #include <pthread.h> Index: systems/fbdev/vt.c =================================================================== --- systems/fbdev/vt.c.orig 2009-11-24 14:54:14.099489693 +0100 +++ systems/fbdev/vt.c 2009-11-24 14:54:27.375488725 +0100 @@ -43,6 +43,7 @@ #include <sys/kd.h> #include <errno.h> #include <pthread.h> +#undef _LINUX_TYPES_H #include <directfb.h> ++++++ DirectFB-1.2.9-ignore-fbmodes.patch ++++++ Index: DirectFB-1.2.9/include/directfb.h =================================================================== --- DirectFB-1.2.9.orig/include/directfb.h +++ DirectFB-1.2.9/include/directfb.h @@ -6326,6 +6326,11 @@ DEFINE_INTERFACE( IDirectFBDataBuffer, ); ) +static inline int ignore_fb_modes() +{ + return getenv("SUSE_IGNORE_FBMODES") != NULL; +} + #ifdef __cplusplus } #endif Index: DirectFB-1.2.9/systems/fbdev/fbdev.c =================================================================== --- DirectFB-1.2.9.orig/systems/fbdev/fbdev.c +++ DirectFB-1.2.9/systems/fbdev/fbdev.c @@ -945,7 +945,9 @@ system_get_deviceid( unsigned int *ret_v static DFBResult init_modes( void ) { - dfb_fbdev_read_modes(); + if (!ignore_fb_modes()) { + dfb_fbdev_read_modes(); + } if (!dfb_fbdev->shared->modes) { /* try to use current mode*/ Index: DirectFB-1.2.9/systems/sdl/sdl.c =================================================================== --- DirectFB-1.2.9.orig/systems/sdl/sdl.c +++ DirectFB-1.2.9/systems/sdl/sdl.c @@ -96,7 +96,9 @@ system_initialize( CoreDFB *core, void * dfb_sdl_core = core; - dfb_fbdev_read_modes(); /* use same mode list as a fake */ + if (!ignore_fb_modes()) { + dfb_fbdev_read_modes(); /* use same mode list as a fake */ + } driver = getenv( "SDL_VIDEODRIVER" ); if (driver && !strcasecmp( driver, "directfb" )) { ++++++ DirectFB-1.5.3-add-missing-davinci-files.patch ++++++ ++++ 1698 lines (skipped) ++++++ DirectFB-1.5.3-fix_v4l1.patch ++++++ diff -up DirectFB-1.5.3/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c.fix_v4l1 DirectFB-1.5.3/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c --- DirectFB-1.5.3/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c.fix_v4l1 2011-07-31 20:51:06.000000000 +0200 +++ DirectFB-1.5.3/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c 2011-08-23 22:38:39.154862445 +0200 @@ -49,7 +49,7 @@ #ifdef HAVE_LINUX_COMPILER_H #include <linux/compiler.h> #endif -#include "videodev.h" +#include <libv4l1-videodev.h> #include <directfb.h> @@ -78,7 +78,7 @@ #include <direct/util.h> #ifdef DFB_HAVE_V4L2 -#include "videodev2.h" +#include <linux/videodev2.h> #endif static DFBResult ++++++ DirectFB-1.5.3-vdpau.patch ++++++ diff -up DirectFB-1.5.3/gfxdrivers/vdpau/Makefile.am.vdpaufix DirectFB-1.5.3/gfxdrivers/vdpau/Makefile.am --- DirectFB-1.5.3/gfxdrivers/vdpau/Makefile.am.vdpaufix 2011-07-31 20:51:06.000000000 +0200 +++ DirectFB-1.5.3/gfxdrivers/vdpau/Makefile.am 2012-08-30 22:42:55.680504159 +0200 @@ -25,7 +25,7 @@ libdirectfb_vdpau_la_SOURCES = \ libdirectfb_vdpau_la_LDFLAGS = \ -module \ -avoid-version \ - $(DFB_LDFLAGS) -lm + $(DFB_LDFLAGS) -lm $(X11VDPAU_LIBS) libdirectfb_vdpau_la_LIBADD = \ $(top_builddir)/lib/direct/libdirect.la \ diff -up DirectFB-1.5.3/gfxdrivers/vdpau/Makefile.in.vdpaufix DirectFB-1.5.3/gfxdrivers/vdpau/Makefile.in --- DirectFB-1.5.3/gfxdrivers/vdpau/Makefile.in.vdpaufix 2011-08-07 06:33:35.000000000 +0200 +++ DirectFB-1.5.3/gfxdrivers/vdpau/Makefile.in 2012-08-30 22:43:07.616564143 +0200 @@ -333,7 +333,7 @@ libdirectfb_vdpau_la_SOURCES = \ libdirectfb_vdpau_la_LDFLAGS = \ -module \ -avoid-version \ - $(DFB_LDFLAGS) -lm + $(DFB_LDFLAGS) -lm $(X11VDPAU_LIBS) libdirectfb_vdpau_la_LIBADD = \ $(top_builddir)/lib/direct/libdirect.la \ ++++++ DirectFB-1.6.1-FusionID-fix-git21c3684.patch ++++++ diff -up DirectFB-1.6.1/wm/unique/uniquewm.c.fusionID DirectFB-1.6.1/wm/unique/uniquewm.c --- DirectFB-1.6.1/wm/unique/uniquewm.c.fusionID 2012-08-29 10:58:22.009758786 -0400 +++ DirectFB-1.6.1/wm/unique/uniquewm.c 2012-08-29 10:58:58.753759640 -0400 @@ -34,6 +34,7 @@ #include <direct/memcpy.h> #include <direct/messages.h> +#include <core/core.h> #include <core/input.h> #include <core/surface.h> #include <core/surface_buffer.h> @@ -275,7 +276,7 @@ unique_wm_create_context( void ) D_MAGIC_ASSERT( wm_shared, WMShared ); D_ASSERT( wm_shared->context_pool != NULL ); - return (UniqueContext*) fusion_object_create( wm_shared->context_pool, wm_data->world ); + return (UniqueContext*) fusion_object_create( wm_shared->context_pool, wm_data->world, Core_GetIdentity() ); } UniqueDecoration * @@ -286,7 +287,7 @@ unique_wm_create_decoration( void ) D_MAGIC_ASSERT( wm_shared, WMShared ); D_ASSERT( wm_shared->decoration_pool != NULL ); - return (UniqueDecoration*) fusion_object_create( wm_shared->decoration_pool, wm_data->world ); + return (UniqueDecoration*) fusion_object_create( wm_shared->decoration_pool, wm_data->world, Core_GetIdentity() ); } UniqueWindow * @@ -297,7 +298,7 @@ unique_wm_create_window( void ) D_MAGIC_ASSERT( wm_shared, WMShared ); D_ASSERT( wm_shared->window_pool != NULL ); - return (UniqueWindow*) fusion_object_create( wm_shared->window_pool, wm_data->world ); + return (UniqueWindow*) fusion_object_create( wm_shared->window_pool, wm_data->world, Core_GetIdentity() ); } /**************************************************************************************************/ ++++++ DirectFB-1.6.1-gcc-atomics-on-arm.patch ++++++ diff -up DirectFB-1.6.1/lib/direct/atomic.h.arm-atomics DirectFB-1.6.1/lib/direct/atomic.h --- DirectFB-1.6.1/lib/direct/atomic.h.arm-atomics 2012-06-29 12:01:11.000000000 -0400 +++ DirectFB-1.6.1/lib/direct/atomic.h 2012-08-29 10:18:08.596702883 -0400 @@ -239,6 +239,31 @@ static inline int _D__atomic_add_return( #define D_SYNC_ADD_AND_FETCH( ptr, value ) \ (_D__atomic_add_return( (int) (value), (volatile int*) (ptr) )) +#elif defined(ARCH_ARM) && !defined(ARCH_IWMMXT) + +static inline int _D__atomic_cmpxchg(volatile int *ptr, int old, int _new) +{ + unsigned long oldval = old; + + __atomic_compare_exchange_n(ptr, &oldval, _new, + false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); + + return oldval; +} + +#define D_SYNC_BOOL_COMPARE_AND_SWAP( ptr, old_value, new_value ) \ + (_D__atomic_cmpxchg( (void*) ptr, (int) old_value, (int) new_value ) == (int) old_value) + +static inline int _D__atomic_add_return(int i, volatile int *v) +{ + int result = __atomic_add_fetch(v, i, __ATOMIC_SEQ_CST); + + return result; +} + +#define D_SYNC_ADD_AND_FETCH( ptr, value ) \ + (_D__atomic_add_return( (int) (value), (volatile int*) (ptr) )) + #endif ++++++ DirectFB-1.6.1-lm.patch ++++++ --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: DirectFB-1.7.1/tests/Makefile.am =================================================================== --- DirectFB-1.7.1.orig/tests/Makefile.am +++ DirectFB-1.7.1/tests/Makefile.am @@ -282,7 +282,7 @@ fusion_call_SOURCES = fusion_call.c fusion_call_LDADD = $(DFB_BASE_LIBS) fusion_call_bench_SOURCES = fusion_call_bench.c -fusion_call_bench_LDADD = $(DFB_BASE_LIBS) +fusion_call_bench_LDADD = $(DFB_BASE_LIBS) $(LIBM) fusion_fork_SOURCES = fusion_fork.c fusion_fork_LDADD = $(DFB_BASE_LIBS) Index: DirectFB-1.7.1/tests/Makefile.in =================================================================== --- DirectFB-1.7.1.orig/tests/Makefile.in +++ DirectFB-1.7.1/tests/Makefile.in @@ -963,7 +963,7 @@ direct_test_LDADD = $(libdirect) fusion_call_SOURCES = fusion_call.c fusion_call_LDADD = $(DFB_BASE_LIBS) fusion_call_bench_SOURCES = fusion_call_bench.c -fusion_call_bench_LDADD = $(DFB_BASE_LIBS) +fusion_call_bench_LDADD = $(DFB_BASE_LIBS) $(LIBM) fusion_fork_SOURCES = fusion_fork.c fusion_fork_LDADD = $(DFB_BASE_LIBS) fusion_reactor_SOURCES = fusion_reactor.c ++++++ DirectFB-1.7.0-int.patch ++++++ Index: DirectFB-1.7.1/include/dfb_types.h =================================================================== --- DirectFB-1.7.1.orig/include/dfb_types.h +++ DirectFB-1.7.1/include/dfb_types.h @@ -56,11 +56,9 @@ #define __u8 u8 #define __u16 u16 #define __u32 u32 -#define __u64 u64 #define __s8 s8 #define __s16 s16 #define __s32 s32 -#define __s64 s64 #endif ++++++ DirectFB-1.7.3-drop-test_foo.patch ++++++ Index: DirectFB-1.7.1/wm/unique/Makefile.am =================================================================== --- DirectFB-1.7.1.orig/wm/unique/Makefile.am +++ DirectFB-1.7.1/wm/unique/Makefile.am @@ -13,7 +13,7 @@ INCLUDES = \ bin_PROGRAMS = uwmdump -noinst_PROGRAMS = test_color test_foo stret_test +noinst_PROGRAMS = test_color stret_test uwmdump_SOURCES = uwmdump.c @@ -31,15 +31,6 @@ test_color_LDADD = \ libuniquewm.la \ $(top_builddir)/lib/direct/libdirect.la \ $(top_builddir)/lib/fusion/libfusion.la \ - $(top_builddir)/src/libdirectfb.la - - -test_foo_SOURCES = test_foo.c - -test_foo_LDADD = \ - libuniquewm.la \ - $(top_builddir)/lib/direct/libdirect.la \ - $(top_builddir)/lib/fusion/libfusion.la \ $(top_builddir)/src/libdirectfb.la Index: DirectFB-1.7.1/wm/unique/Makefile.in =================================================================== @@ -83,7 +83,7 @@ host_triplet = @host@ target_triplet = @target@ bin_PROGRAMS = uwmdump$(EXEEXT) -noinst_PROGRAMS = test_color$(EXEEXT) test_foo$(EXEEXT) \ +noinst_PROGRAMS = test_color$(EXEEXT) \ stret_test$(EXEEXT) DIST_COMMON = $(top_srcdir)/rules/libobject.make $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/depcomp $(include_HEADERS) @@ -171,12 +171,6 @@ $(top_builddir)/lib/direct/libdirect.la \ $(top_builddir)/lib/fusion/libfusion.la \ $(top_builddir)/src/libdirectfb.la -am_test_foo_OBJECTS = test_foo.$(OBJEXT) -test_foo_OBJECTS = $(am_test_foo_OBJECTS) -test_foo_DEPENDENCIES = libuniquewm.la \ - $(top_builddir)/lib/direct/libdirect.la \ - $(top_builddir)/lib/fusion/libfusion.la \ - $(top_builddir)/src/libdirectfb.la am_uwmdump_OBJECTS = uwmdump.$(OBJEXT) uwmdump_OBJECTS = $(am_uwmdump_OBJECTS) uwmdump_DEPENDENCIES = libuniquewm.la \ @@ -219,10 +213,10 @@ am__v_CCLD_1 = SOURCES = $(libdirectfbwm_unique_la_SOURCES) $(libuniquewm_la_SOURCES) \ $(stret_test_SOURCES) $(test_color_SOURCES) \ - $(test_foo_SOURCES) $(uwmdump_SOURCES) + $(uwmdump_SOURCES) DIST_SOURCES = $(libdirectfbwm_unique_la_SOURCES) \ $(libuniquewm_la_SOURCES) $(stret_test_SOURCES) \ - $(test_color_SOURCES) $(test_foo_SOURCES) $(uwmdump_SOURCES) + $(test_color_SOURCES) $(uwmdump_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ install-data-recursive install-dvi-recursive \ @@ -588,13 +582,6 @@ $(top_builddir)/lib/fusion/libfusion.la \ $(top_builddir)/src/libdirectfb.la -test_foo_SOURCES = test_foo.c -test_foo_LDADD = \ - libuniquewm.la \ - $(top_builddir)/lib/direct/libdirect.la \ - $(top_builddir)/lib/fusion/libfusion.la \ - $(top_builddir)/src/libdirectfb.la - stret_test_SOURCES = stret_test.c stret_test_LDADD = \ libuniquewm.la \ @@ -844,10 +831,6 @@ @rm -f test_color$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_color_OBJECTS) $(test_color_LDADD) $(LIBS) -test_foo$(EXEEXT): $(test_foo_OBJECTS) $(test_foo_DEPENDENCIES) $(EXTRA_test_foo_DEPENDENCIES) - @rm -f test_foo$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_foo_OBJECTS) $(test_foo_LDADD) $(LIBS) - uwmdump$(EXEEXT): $(uwmdump_OBJECTS) $(uwmdump_DEPENDENCIES) $(EXTRA_uwmdump_DEPENDENCIES) @rm -f uwmdump$(EXEEXT) $(AM_V_CCLD)$(LINK) $(uwmdump_OBJECTS) $(uwmdump_LDADD) $(LIBS) @@ -867,7 +850,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stret_iteration.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stret_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_color.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_foo.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unique.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniquewm.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uwmdump.Po@am__quote@ ++++++ DirectFB-CVE-2014-2977.patch ++++++ Index: proxy/dispatcher/idirectfbsurface_dispatcher.c =================================================================== --- proxy/dispatcher/idirectfbsurface_dispatcher.c.orig 2014-03-22 21:05:18.000000000 +0100 +++ proxy/dispatcher/idirectfbsurface_dispatcher.c 2015-03-23 13:07:30.840507533 +0100 @@ -1729,6 +1729,9 @@ VOODOO_PARSER_GET_INT( parser, pitch ); VOODOO_PARSER_END( parser ); + /* CVE-2014-2977 */ + DFB_RECTANGLE_ASSERT_IF( rect ); + if (encoded) { switch (encoded) { case 2: { ++++++ DirectFB-CVE-2014-2978.patch ++++++ Index: proxy/dispatcher/idirectfbsurface_dispatcher.c =================================================================== --- proxy/dispatcher/idirectfbsurface_dispatcher.c.orig 2014-03-22 21:05:18.000000000 +0100 +++ proxy/dispatcher/idirectfbsurface_dispatcher.c 2015-03-23 15:03:28.650053384 +0100 @@ -1629,6 +1629,11 @@ dst[out++] = RLE16_KEY; } else { + /* CVE-2014-2978 */ + if (count > num - out ) { + break; + } + last = src[n++]; while (count >= 4) { @@ -1679,6 +1684,11 @@ dst[out++] = RLE32_KEY; } else { + /* CVE-2014-2978 */ + if (count > num - out ) { + break; + } + last = src[n++]; while (count >= 4) { ++++++ DirectFB-cc-cflags.patch ++++++ Index: DirectFB-1.2.9/configure.in =================================================================== --- DirectFB-1.2.9.orig/configure.in 2009-11-24 14:54:14.042364493 +0100 +++ DirectFB-1.2.9/configure.in 2009-11-24 14:54:38.866364832 +0100 @@ -341,8 +341,12 @@ ## AS=$CC ASFLAGS=$CFLAGS + CCAS=$CC + CCASFLAGS=$CFLAGS AC_SUBST(AS) AC_SUBST(ASFLAGS) + AC_SUBST(CCAS) + AC_SUBST(CCASFLAGS) AC_DEFINE(HAVE_INB_OUTB_IOPL,1, [Define to 1 if inb, outb and iopl are available.]) ++++++ DirectFB-setregion.patch ++++++ Index: DirectFB-1.6.2/gfxdrivers/cyber5k/cyber5k.c =================================================================== --- DirectFB-1.6.2.orig/gfxdrivers/cyber5k/cyber5k.c +++ DirectFB-1.6.2/gfxdrivers/cyber5k/cyber5k.c @@ -636,7 +636,8 @@ osdSetRegion( CoreLayer CoreLayerRegionConfigFlags updated, CoreSurface *surface, CorePalette *palette, - CoreSurfaceBufferLock *lock ) + CoreSurfaceBufferLock *left_lock, + CoreSurfaceBufferLock *right_lock ) { DFBResult ret; @@ -644,7 +645,7 @@ osdSetRegion( CoreLayer ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData, layer_data, region_data, config, updated, surface, - palette, lock ); + palette, left_lock, right_lock ); if (ret) return ret; Index: DirectFB-1.6.2/gfxdrivers/radeon/radeon_crtc1.c =================================================================== --- DirectFB-1.6.2.orig/gfxdrivers/radeon/radeon_crtc1.c +++ DirectFB-1.6.2/gfxdrivers/radeon/radeon_crtc1.c @@ -147,14 +147,15 @@ crtc1SetRegion( CoreLayer CoreLayerRegionConfigFlags updated, CoreSurface *surface, CorePalette *palette, - CoreSurfaceBufferLock *lock ) + CoreSurfaceBufferLock *left_lock, + CoreSurfaceBufferLock *right_lock ) { if (updated & ~CLRCF_OPTIONS) { return OldPrimaryLayerFuncs.SetRegion( layer, OldPrimaryLayerDriverData, layer_data, region_data, - config, updated, surface, palette, lock ); + config, updated, surface, palette, left_lock, right_lock ); } return DFB_OK; ++++++ baselibs.conf ++++++ libdirectfb-1_7-5 DirectFB-devel requires -DirectFB-<targettype> requires "libdirectfb-1_7-5-<targettype> = <version>"
participants (1)
-
root＠hilbert.suse.de