Hello community, here is the log from the commit of package DirectFB for openSUSE:Factory checked in at 2012-12-19 10:52:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/DirectFB (Old) and /work/SRC/openSUSE:Factory/.DirectFB.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "DirectFB", Maintainer is "mvysko...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/DirectFB/DirectFB.changes 2012-09-29 15:24:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.DirectFB.new/DirectFB.changes 2012-12-19 10:52:34.000000000 +0100 @@ -1,0 +2,52 @@ +Tue Dec 18 10:02:38 UTC 2012 - mvysko...@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.boo...@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.drou...@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 + +------------------------------------------------------------------- Old: ---- DirectFB-1.4.17.tar.bz2 New: ---- 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.6.1-mesa-libgbm-stridefix.patch DirectFB-1.6.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ DirectFB.spec ++++++ --- /var/tmp/diff_new_pack.f6d7v4/_old 2012-12-19 10:52:36.000000000 +0100 +++ /var/tmp/diff_new_pack.f6d7v4/_new 2012-12-19 10:52:36.000000000 +0100 @@ -16,27 +16,45 @@ # -%define directfbdir %{_libdir}/directfb-1.4-6 +%define directfbdir %{_libdir}/directfb-1.6-0 Name: DirectFB -%define lname libdirectfb-1_4-6 -Url: http://www.directfb.org/ -Version: 1.4.17 +Version: 1.6.2 Release: 0 Summary: Graphics Library for Framebuffer Devices License: LGPL-2.1+ Group: System/Libraries +%define lname libdirectfb-1_6-0 +Url: http://www.directfb.org/ Source: %{name}-%{version}.tar.bz2 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-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 -- pgaj...@suse.com; build with libpng15; sent today to a...@directfb.org # build against libpng14 should not be affected, otherwise please let me know -BuildRoot: %{_tmppath}/%{name}-%{version}-build +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 +Patch18: DirectFB-1.6.1-mesa-libgbm-stridefix.patch +# PATCH-FIX-UPSTREAM +Patch19: DirectFB-1.6.1-FusionID-fix-git21c3684.patch BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel BuildRequires: freetype2-devel @@ -44,16 +62,12 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libstdc++-devel +BuildRequires: libv4l-devel +BuildRequires: sysfsutils-devel BuildRequires: udev BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libXext-devel -%if 0%{?suse_version} > 1130 -BuildRequires: sysfsutils-devel -%else -BuildRequires: sysfsutils -%endif -BuildRequires: pkg-config -BuildRequires: zlib-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %ifnarch s390 s390x BuildRequires: i2c-tools %endif @@ -89,7 +103,7 @@ %package devel Summary: Graphics Library for Framebuffer Devices Group: Development/Libraries/C and C++ -Requires: %lname = %version +Requires: %lname = %{version} Requires: /bin/sh Requires: glibc-devel Requires: zlib-devel @@ -150,6 +164,26 @@ %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 +%if 0%{?suse_version} > 1220 +%patch18 -p1 -b .stride +%endif +%patch19 -p1 -b .fusionID +#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} %build %ifarch s390 s390x @@ -176,12 +210,16 @@ --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 -%{makeinstall} -find "%buildroot" -name '*.la' -type f -delete +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} @@ -212,9 +250,9 @@ %{_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 +%doc %{_mandir}/man1/dfbg.1.gz +%doc %{_mandir}/man1/directfb-csource.1.gz +%doc %{_mandir}/man5/directfbrc.5.gz %files -n %lname %defattr(-,root,root) @@ -236,8 +274,8 @@ %{_libdir}/libdirect*.so %{_libdir}/libfusion*.so %{_libdir}/libuniquewm*.so -/usr/include/directfb-internal -/usr/include/directfb +%{_includedir}/directfb-internal +%{_includedir}/directfb %{_libdir}/pkgconfig/* %files doc ++++++ 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 ++++++ diff -up DirectFB-1.6.1/tests/Makefile.am.lm DirectFB-1.6.1/tests/Makefile.am --- DirectFB-1.6.1/tests/Makefile.am.lm 2012-06-29 12:01:11.000000000 -0400 +++ DirectFB-1.6.1/tests/Makefile.am 2012-08-29 11:18:26.528786687 -0400 @@ -148,15 +148,15 @@ dfbtest_gl1_LDADD = $(libdirectfb) $(l dfbtest_gl2_SOURCES = dfbtest_gl2.c dfbtest_gl2_CFLAGS = $(GLES2_CFLAGS) -dfbtest_gl2_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) $(GL_LIBS) $(GLES2_LIBS) +dfbtest_gl2_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) $(GL_LIBS) $(GLES2_LIBS) -lm dfbtest_gl3_SOURCES = dfbtest_gl3.c dfbtest_gl3_CFLAGS = $(GLES2_CFLAGS) -dfbtest_gl3_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) $(GL_LIBS) $(GLES2_LIBS) +dfbtest_gl3_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) $(GL_LIBS) $(GLES2_LIBS) -lm dfbtest_old_gl2_SOURCES = dfbtest_old_gl2.c dfbtest_old_gl2_CFLAGS = $(GLES2_CFLAGS) -dfbtest_old_gl2_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) $(GL_LIBS) $(GLES2_LIBS) +dfbtest_old_gl2_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) $(GL_LIBS) $(GLES2_LIBS) -lm dfbtest_mirror_SOURCES = dfbtest_mirror.c dfbtest_mirror_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) @@ -227,7 +227,7 @@ fusion_call_SOURCES = fusion_call.c fusion_call_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) fusion_call_bench_SOURCES = fusion_call_bench.c -fusion_call_bench_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) +fusion_call_bench_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) -lm fusion_fork_SOURCES = fusion_fork.c fusion_fork_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) diff -up DirectFB-1.6.1/tests/Makefile.in.lm DirectFB-1.6.1/tests/Makefile.in --- DirectFB-1.6.1/tests/Makefile.in.lm 2012-06-29 12:01:36.000000000 -0400 +++ DirectFB-1.6.1/tests/Makefile.in 2012-08-29 11:18:18.712786508 -0400 @@ -758,13 +758,13 @@ dfbtest_gl1_CFLAGS = $(GLES2_CFLAGS) dfbtest_gl1_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) $(GL_LIBS) $(GLES2_LIBS) dfbtest_gl2_SOURCES = dfbtest_gl2.c dfbtest_gl2_CFLAGS = $(GLES2_CFLAGS) -dfbtest_gl2_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) $(GL_LIBS) $(GLES2_LIBS) +dfbtest_gl2_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) $(GL_LIBS) $(GLES2_LIBS) -lm dfbtest_gl3_SOURCES = dfbtest_gl3.c dfbtest_gl3_CFLAGS = $(GLES2_CFLAGS) -dfbtest_gl3_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) $(GL_LIBS) $(GLES2_LIBS) +dfbtest_gl3_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) $(GL_LIBS) $(GLES2_LIBS) -lm dfbtest_old_gl2_SOURCES = dfbtest_old_gl2.c dfbtest_old_gl2_CFLAGS = $(GLES2_CFLAGS) -dfbtest_old_gl2_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) $(GL_LIBS) $(GLES2_LIBS) +dfbtest_old_gl2_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) $(GL_LIBS) $(GLES2_LIBS) -lm dfbtest_mirror_SOURCES = dfbtest_mirror.c dfbtest_mirror_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) dfbtest_prealloc_SOURCES = dfbtest_prealloc.c @@ -810,7 +810,7 @@ direct_test_LDADD = $(libdirect) fusion_call_SOURCES = fusion_call.c fusion_call_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) fusion_call_bench_SOURCES = fusion_call_bench.c -fusion_call_bench_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) +fusion_call_bench_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) -lm fusion_fork_SOURCES = fusion_fork.c fusion_fork_LDADD = $(libdirectfb) $(libone) $(libvoodoo) $(libfusion) $(libdirect) fusion_reactor_SOURCES = fusion_reactor.c ++++++ DirectFB-1.6.1-mesa-libgbm-stridefix.patch ++++++ diff -up DirectFB-1.6.1/systems/mesa/mesa_surface_pool.c.stride DirectFB-1.6.1/systems/mesa/mesa_surface_pool.c --- DirectFB-1.6.1/systems/mesa/mesa_surface_pool.c.stride 2012-08-29 10:55:30.531754814 -0400 +++ DirectFB-1.6.1/systems/mesa/mesa_surface_pool.c 2012-08-29 10:55:36.949754963 -0400 @@ -297,7 +297,7 @@ mesaAllocateBuffer( CoreSurfacePool alloc->bo = gbm_bo_create( mesa->gbm, surface->config.size.w, surface->config.size.h, GBM_BO_FORMAT_ARGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING ); alloc->handle = gbm_bo_get_handle( alloc->bo ).u32; - alloc->pitch = gbm_bo_get_pitch( alloc->bo ); + alloc->pitch = gbm_bo_get_stride( alloc->bo ); alloc->image = eglCreateImageKHR( mesa->dpy, NULL, EGL_NATIVE_PIXMAP_KHR, alloc->bo, NULL ); ++++++ DirectFB-1.4.17.tar.bz2 -> DirectFB-1.6.2.tar.bz2 ++++++ ++++ 206427 lines of diff (skipped) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.f6d7v4/_old 2012-12-19 10:52:38.000000000 +0100 +++ /var/tmp/diff_new_pack.f6d7v4/_new 2012-12-19 10:52:38.000000000 +0100 @@ -1,4 +1,4 @@ -libdirectfb-1_4-6 +libdirectfb-1_6-0 DirectFB-devel requires -DirectFB-<targettype> - requires "libdirectfb-1_4-6-<targettype> = <version>" + requires "libdirectfb-1_6-0-<targettype> = <version>" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org