Package: directfb Severity: wishlist Tags: patch Hi there,
When trying to port the DirectFB work from Gtk 2.8 to 2.10, I ended up having this problem: if /bin/sh ../../libtool --mode=compile i486-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I. -I../.. -DG_LOG_DOMAIN=\"Gdk-DirectFB\" -I../.. -I../../gdk -I../../gdk -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_CAST_CHECKS -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo -D_REENTRANT -I/usr/include/directfb -I/usr/lib/libcairo-directfb/include/cairo -DG_DISABLE_DEPRECATED -g -O2 -Wall -MT gdkwindow-directfb.lo -MD -MP -MF ".deps/gdkwindow-directfb.Tpo" \ -c -o gdkwindow-directfb.lo `test -f 'gdkwindow-directfb.c' || echo './'`gdkwindow-directfb.c; \ then mv -f ".deps/gdkwindow-directfb.Tpo" ".deps/gdkwindow-directfb.Plo"; \ else rm -f ".deps/gdkwindow-directfb.Tpo"; exit 1; \ fi i486-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I. -I../.. -DG_LOG_DOMAIN=\"Gdk-DirectFB\" -I../.. -I../../gdk -I../../gdk -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_CAST_CHECKS -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo -D_REENTRANT -I/usr/include/directfb -I/usr/lib/libcairo-directfb/include/cairo -DG_DISABLE_DEPRECATED -g -O2 -Wall -MT gdkwindow-directfb.lo -MD -MP -MF .deps/gdkwindow-directfb.Tpo -c gdkwindow-directfb.c -fPIC -DPIC -o .libs/gdkwindow-directfb.o gdkwindow-directfb.c: In function '_gdk_directfb_move_resize_child': gdkwindow-directfb.c:1303: error: 'IDirectFBSurface' has no member named 'GetPosition' make[4]: *** [gdkwindow-directfb.lo] Error 1 make[4]: leaving directory « /home/lool/.svn-buildpackage/buildArea/pkg-gnome/gtk+2.0-2.10.1/build-tree/gtk+-2.10.1-dfb/gdk/directfb » It seems this is due to CVS only API additions. I've prepared a CVS snapshot of libdirectfb and it permits building of the directfb backend of gdk/gtk (but I didn't test whether it actually works). I attach you the interdiff of my local packages; if you want I can upload a NMU to experimental with these changes which would in turn permit uploading Gtk 2.10. Some binaries are at: <http://people.dooz.org/~lool/debian/directfb/0.9.26~cvs20060815-0.1/sid/> Bye, -- System Information: Debian Release: Debian unstable (sid) APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.17-1-686 Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15) -- Loïc Minier <[EMAIL PROTECTED]>
--- directfb-0.9.25.1/debian/patches/24_distclean.patch +++ directfb-0.9.25.1.orig/debian/patches/24_distclean.patch @@ -1,794 +0,0 @@ -#DPATCHLEVEL=0 ---- directfb.spec 2006-05-03 10:24:30.000000000 +0300 -+++ directfb.spec 1970-01-01 02:00:00.000000000 +0200 -@@ -1,118 +0,0 @@ --%define name directfb --%define version 0.9.25 --%define oname DirectFB --%define libname lib%name -- --Summary: Hardware graphics acceleration library --Name: %name --Version: %version --Release: 1 --License: LGPL --Group: System/Libraries --Source0: http://www.directfb.org/download/%{name}/%{oname}-%{version}.tar.gz --URL: http://www.directfb.org/ --BuildRequires: libpng-devel >= 1.2.0 --BuildRequires: zlib-devel >= 1.1.3 --BuildRequires: libjpeg-devel >= 6b --BuildRequires: freetype2-devel >= 2.0.2 --BuildRoot: %{_tmppath}/%{name}-%{version} -- --%description --%oname - A hardware-accelerated graphics library on top of the Linux frame buffer device. -- --%package -n %libname --Summary: Shared library part of %oname --Group: System/Libraries -- --%description -n %libname --%oname - A hardware-accelerated graphics library on top of the Linux frame buffer device. -- --%oname is a thin library that provides developers with 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 frame buffer device. It is a complete hardware abstraction layer --with software fallbacks for every graphics operation that is not supported by --the underlying hardware. -- --%package -n %libname-devel --Group: Development/C --Summary: Header files for compiling %oname applications --Requires: %{libname} = %{version}-%release --Provides: lib%name-devel = %version-%release --Provides: %oname-devel = %version-%release -- --%description -n %libname-devel --%oname header files needed for building applications based on %oname. -- --%package doc --Summary: %oname documentation --Group: Development/Other -- --%description doc --%oname documentation in html format. -- --%prep --%setup -q -n %oname-%version -- --%build --%configure \ -- --enable-fbdev \ -- --disable-maintainer-mode \ -- --enable-shared \ -- --disable-fast-install \ -- --disable-debug \ -- --program-transform-name="" # is this hack needed? -- --%make -- --%install --rm -rf $RPM_BUILD_ROOT --%makeinstall_std -- --%clean --rm -rf $RPM_BUILD_ROOT -- --%post -n %libname -p /sbin/ldconfig --%postun -n %libname -p /sbin/ldconfig -- --%files -n %libname --%defattr(644,root,root,755) --%doc README* AUTHORS ChangeLog NEWS TODO --%attr(755,root,root) %{_libdir}/lib*.so.* --%{_libdir}/directfb-%version --%{_datadir}/directfb-%version --%{_mandir}/man5/*directfbrc.5* -- --%files -n %libname-devel --%defattr(644,root,root,755) --%attr(755,root,root) %{_bindir}/*directfb-config --%attr(755,root,root) %{_bindir}/*directfb-csource --%attr(755,root,root) %{_bindir}/*dfbg --%{_includedir}/directfb --%{_includedir}/directfb-internal --%{_mandir}/man1/*directfb-csource.1* --%{_mandir}/man1/*dfbg.1* --%{_libdir}/pkgconfig/* --%{_libdir}/*.la --%{_libdir}/*.so -- --%files doc --%defattr(644,root,root,755) --%doc docs/html/* -- --%changelog --* Mon Jan 13 2003 Sven Neumann <[EMAIL PROTECTED]> 0.9.16 --- removed reference to avifile --- added rules for dfbg and its man-page -- --%changelog --* Sun Oct 27 2002 Sven Neumann <[EMAIL PROTECTED]> 0.9.14 --- added this file as directfb.spec.in to the DirectFB source tree --- moved directfbrc manpage to the main package -- --* Fri Aug 23 2002 Götz Waschk <[EMAIL PROTECTED]> 0.9.13-1mdk --- add directfb-csource and man page --- 0.9.13 -- --* Thu Jul 11 2002 Götz Waschk <[EMAIL PROTECTED]> 0.9.12-1mdk --- initial package based on PLD effort ---- include/directfb_keynames.h 2006-05-03 10:24:38.000000000 +0300 -+++ include/directfb_keynames.h 1970-01-01 02:00:00.000000000 +0200 -@@ -1,387 +0,0 @@ --#ifndef __DIRECTFB_KEYNAMES_H__ --#define __DIRECTFB_KEYNAMES_H__ -- --#define DirectFBKeySymbolNames(Identifier) struct DFBKeySymbolName { \ -- DFBInputDeviceKeySymbol symbol; \ -- const char *name; \ --} Identifier[] = { \ -- { DIKS_BACKSPACE, "BACKSPACE" }, \ -- { DIKS_TAB, "TAB" }, \ -- { DIKS_RETURN, "RETURN" }, \ -- { DIKS_CANCEL, "CANCEL" }, \ -- { DIKS_ESCAPE, "ESCAPE" }, \ -- { DIKS_SPACE, "SPACE" }, \ -- { DIKS_EXCLAMATION_MARK, "EXCLAMATION_MARK" }, \ -- { DIKS_QUOTATION, "QUOTATION" }, \ -- { DIKS_NUMBER_SIGN, "NUMBER_SIGN" }, \ -- { DIKS_DOLLAR_SIGN, "DOLLAR_SIGN" }, \ -- { DIKS_PERCENT_SIGN, "PERCENT_SIGN" }, \ -- { DIKS_AMPERSAND, "AMPERSAND" }, \ -- { DIKS_APOSTROPHE, "APOSTROPHE" }, \ -- { DIKS_PARENTHESIS_LEFT, "PARENTHESIS_LEFT" }, \ -- { DIKS_PARENTHESIS_RIGHT, "PARENTHESIS_RIGHT" }, \ -- { DIKS_ASTERISK, "ASTERISK" }, \ -- { DIKS_PLUS_SIGN, "PLUS_SIGN" }, \ -- { DIKS_COMMA, "COMMA" }, \ -- { DIKS_MINUS_SIGN, "MINUS_SIGN" }, \ -- { DIKS_PERIOD, "PERIOD" }, \ -- { DIKS_SLASH, "SLASH" }, \ -- { DIKS_0, "0" }, \ -- { DIKS_1, "1" }, \ -- { DIKS_2, "2" }, \ -- { DIKS_3, "3" }, \ -- { DIKS_4, "4" }, \ -- { DIKS_5, "5" }, \ -- { DIKS_6, "6" }, \ -- { DIKS_7, "7" }, \ -- { DIKS_8, "8" }, \ -- { DIKS_9, "9" }, \ -- { DIKS_COLON, "COLON" }, \ -- { DIKS_SEMICOLON, "SEMICOLON" }, \ -- { DIKS_LESS_THAN_SIGN, "LESS_THAN_SIGN" }, \ -- { DIKS_EQUALS_SIGN, "EQUALS_SIGN" }, \ -- { DIKS_GREATER_THAN_SIGN, "GREATER_THAN_SIGN" }, \ -- { DIKS_QUESTION_MARK, "QUESTION_MARK" }, \ -- { DIKS_AT, "AT" }, \ -- { DIKS_CAPITAL_A, "CAPITAL_A" }, \ -- { DIKS_CAPITAL_B, "CAPITAL_B" }, \ -- { DIKS_CAPITAL_C, "CAPITAL_C" }, \ -- { DIKS_CAPITAL_D, "CAPITAL_D" }, \ -- { DIKS_CAPITAL_E, "CAPITAL_E" }, \ -- { DIKS_CAPITAL_F, "CAPITAL_F" }, \ -- { DIKS_CAPITAL_G, "CAPITAL_G" }, \ -- { DIKS_CAPITAL_H, "CAPITAL_H" }, \ -- { DIKS_CAPITAL_I, "CAPITAL_I" }, \ -- { DIKS_CAPITAL_J, "CAPITAL_J" }, \ -- { DIKS_CAPITAL_K, "CAPITAL_K" }, \ -- { DIKS_CAPITAL_L, "CAPITAL_L" }, \ -- { DIKS_CAPITAL_M, "CAPITAL_M" }, \ -- { DIKS_CAPITAL_N, "CAPITAL_N" }, \ -- { DIKS_CAPITAL_O, "CAPITAL_O" }, \ -- { DIKS_CAPITAL_P, "CAPITAL_P" }, \ -- { DIKS_CAPITAL_Q, "CAPITAL_Q" }, \ -- { DIKS_CAPITAL_R, "CAPITAL_R" }, \ -- { DIKS_CAPITAL_S, "CAPITAL_S" }, \ -- { DIKS_CAPITAL_T, "CAPITAL_T" }, \ -- { DIKS_CAPITAL_U, "CAPITAL_U" }, \ -- { DIKS_CAPITAL_V, "CAPITAL_V" }, \ -- { DIKS_CAPITAL_W, "CAPITAL_W" }, \ -- { DIKS_CAPITAL_X, "CAPITAL_X" }, \ -- { DIKS_CAPITAL_Y, "CAPITAL_Y" }, \ -- { DIKS_CAPITAL_Z, "CAPITAL_Z" }, \ -- { DIKS_SQUARE_BRACKET_LEFT, "SQUARE_BRACKET_LEFT" }, \ -- { DIKS_BACKSLASH, "BACKSLASH" }, \ -- { DIKS_SQUARE_BRACKET_RIGHT, "SQUARE_BRACKET_RIGHT" }, \ -- { DIKS_CIRCUMFLEX_ACCENT, "CIRCUMFLEX_ACCENT" }, \ -- { DIKS_UNDERSCORE, "UNDERSCORE" }, \ -- { DIKS_GRAVE_ACCENT, "GRAVE_ACCENT" }, \ -- { DIKS_SMALL_A, "SMALL_A" }, \ -- { DIKS_SMALL_B, "SMALL_B" }, \ -- { DIKS_SMALL_C, "SMALL_C" }, \ -- { DIKS_SMALL_D, "SMALL_D" }, \ -- { DIKS_SMALL_E, "SMALL_E" }, \ -- { DIKS_SMALL_F, "SMALL_F" }, \ -- { DIKS_SMALL_G, "SMALL_G" }, \ -- { DIKS_SMALL_H, "SMALL_H" }, \ -- { DIKS_SMALL_I, "SMALL_I" }, \ -- { DIKS_SMALL_J, "SMALL_J" }, \ -- { DIKS_SMALL_K, "SMALL_K" }, \ -- { DIKS_SMALL_L, "SMALL_L" }, \ -- { DIKS_SMALL_M, "SMALL_M" }, \ -- { DIKS_SMALL_N, "SMALL_N" }, \ -- { DIKS_SMALL_O, "SMALL_O" }, \ -- { DIKS_SMALL_P, "SMALL_P" }, \ -- { DIKS_SMALL_Q, "SMALL_Q" }, \ -- { DIKS_SMALL_R, "SMALL_R" }, \ -- { DIKS_SMALL_S, "SMALL_S" }, \ -- { DIKS_SMALL_T, "SMALL_T" }, \ -- { DIKS_SMALL_U, "SMALL_U" }, \ -- { DIKS_SMALL_V, "SMALL_V" }, \ -- { DIKS_SMALL_W, "SMALL_W" }, \ -- { DIKS_SMALL_X, "SMALL_X" }, \ -- { DIKS_SMALL_Y, "SMALL_Y" }, \ -- { DIKS_SMALL_Z, "SMALL_Z" }, \ -- { DIKS_CURLY_BRACKET_LEFT, "CURLY_BRACKET_LEFT" }, \ -- { DIKS_VERTICAL_BAR, "VERTICAL_BAR" }, \ -- { DIKS_CURLY_BRACKET_RIGHT, "CURLY_BRACKET_RIGHT" }, \ -- { DIKS_TILDE, "TILDE" }, \ -- { DIKS_DELETE, "DELETE" }, \ -- { DIKS_CURSOR_LEFT, "CURSOR_LEFT" }, \ -- { DIKS_CURSOR_RIGHT, "CURSOR_RIGHT" }, \ -- { DIKS_CURSOR_UP, "CURSOR_UP" }, \ -- { DIKS_CURSOR_DOWN, "CURSOR_DOWN" }, \ -- { DIKS_INSERT, "INSERT" }, \ -- { DIKS_HOME, "HOME" }, \ -- { DIKS_END, "END" }, \ -- { DIKS_PAGE_UP, "PAGE_UP" }, \ -- { DIKS_PAGE_DOWN, "PAGE_DOWN" }, \ -- { DIKS_PRINT, "PRINT" }, \ -- { DIKS_PAUSE, "PAUSE" }, \ -- { DIKS_OK, "OK" }, \ -- { DIKS_SELECT, "SELECT" }, \ -- { DIKS_GOTO, "GOTO" }, \ -- { DIKS_CLEAR, "CLEAR" }, \ -- { DIKS_POWER, "POWER" }, \ -- { DIKS_POWER2, "POWER2" }, \ -- { DIKS_OPTION, "OPTION" }, \ -- { DIKS_MENU, "MENU" }, \ -- { DIKS_HELP, "HELP" }, \ -- { DIKS_INFO, "INFO" }, \ -- { DIKS_TIME, "TIME" }, \ -- { DIKS_VENDOR, "VENDOR" }, \ -- { DIKS_ARCHIVE, "ARCHIVE" }, \ -- { DIKS_PROGRAM, "PROGRAM" }, \ -- { DIKS_CHANNEL, "CHANNEL" }, \ -- { DIKS_FAVORITES, "FAVORITES" }, \ -- { DIKS_EPG, "EPG" }, \ -- { DIKS_PVR, "PVR" }, \ -- { DIKS_MHP, "MHP" }, \ -- { DIKS_LANGUAGE, "LANGUAGE" }, \ -- { DIKS_TITLE, "TITLE" }, \ -- { DIKS_SUBTITLE, "SUBTITLE" }, \ -- { DIKS_ANGLE, "ANGLE" }, \ -- { DIKS_ZOOM, "ZOOM" }, \ -- { DIKS_MODE, "MODE" }, \ -- { DIKS_KEYBOARD, "KEYBOARD" }, \ -- { DIKS_PC, "PC" }, \ -- { DIKS_SCREEN, "SCREEN" }, \ -- { DIKS_TV, "TV" }, \ -- { DIKS_TV2, "TV2" }, \ -- { DIKS_VCR, "VCR" }, \ -- { DIKS_VCR2, "VCR2" }, \ -- { DIKS_SAT, "SAT" }, \ -- { DIKS_SAT2, "SAT2" }, \ -- { DIKS_CD, "CD" }, \ -- { DIKS_TAPE, "TAPE" }, \ -- { DIKS_RADIO, "RADIO" }, \ -- { DIKS_TUNER, "TUNER" }, \ -- { DIKS_PLAYER, "PLAYER" }, \ -- { DIKS_TEXT, "TEXT" }, \ -- { DIKS_DVD, "DVD" }, \ -- { DIKS_AUX, "AUX" }, \ -- { DIKS_MP3, "MP3" }, \ -- { DIKS_PHONE, "PHONE" }, \ -- { DIKS_AUDIO, "AUDIO" }, \ -- { DIKS_VIDEO, "VIDEO" }, \ -- { DIKS_INTERNET, "INTERNET" }, \ -- { DIKS_MAIL, "MAIL" }, \ -- { DIKS_NEWS, "NEWS" }, \ -- { DIKS_DIRECTORY, "DIRECTORY" }, \ -- { DIKS_LIST, "LIST" }, \ -- { DIKS_CALCULATOR, "CALCULATOR" }, \ -- { DIKS_MEMO, "MEMO" }, \ -- { DIKS_CALENDAR, "CALENDAR" }, \ -- { DIKS_EDITOR, "EDITOR" }, \ -- { DIKS_RED, "RED" }, \ -- { DIKS_GREEN, "GREEN" }, \ -- { DIKS_YELLOW, "YELLOW" }, \ -- { DIKS_BLUE, "BLUE" }, \ -- { DIKS_CHANNEL_UP, "CHANNEL_UP" }, \ -- { DIKS_CHANNEL_DOWN, "CHANNEL_DOWN" }, \ -- { DIKS_BACK, "BACK" }, \ -- { DIKS_FORWARD, "FORWARD" }, \ -- { DIKS_FIRST, "FIRST" }, \ -- { DIKS_LAST, "LAST" }, \ -- { DIKS_VOLUME_UP, "VOLUME_UP" }, \ -- { DIKS_VOLUME_DOWN, "VOLUME_DOWN" }, \ -- { DIKS_MUTE, "MUTE" }, \ -- { DIKS_AB, "AB" }, \ -- { DIKS_PLAYPAUSE, "PLAYPAUSE" }, \ -- { DIKS_PLAY, "PLAY" }, \ -- { DIKS_STOP, "STOP" }, \ -- { DIKS_RESTART, "RESTART" }, \ -- { DIKS_SLOW, "SLOW" }, \ -- { DIKS_FAST, "FAST" }, \ -- { DIKS_RECORD, "RECORD" }, \ -- { DIKS_EJECT, "EJECT" }, \ -- { DIKS_SHUFFLE, "SHUFFLE" }, \ -- { DIKS_REWIND, "REWIND" }, \ -- { DIKS_FASTFORWARD, "FASTFORWARD" }, \ -- { DIKS_PREVIOUS, "PREVIOUS" }, \ -- { DIKS_NEXT, "NEXT" }, \ -- { DIKS_BEGIN, "BEGIN" }, \ -- { DIKS_DIGITS, "DIGITS" }, \ -- { DIKS_TEEN, "TEEN" }, \ -- { DIKS_TWEN, "TWEN" }, \ -- { DIKS_BREAK, "BREAK" }, \ -- { DIKS_EXIT, "EXIT" }, \ -- { DIKS_SETUP, "SETUP" }, \ -- { DIKS_CURSOR_LEFT_UP, "CURSOR_LEFT_UP" }, \ -- { DIKS_CURSOR_LEFT_DOWN, "CURSOR_LEFT_DOWN" }, \ -- { DIKS_CURSOR_UP_RIGHT, "CURSOR_UP_RIGHT" }, \ -- { DIKS_CURSOR_DOWN_RIGHT, "CURSOR_DOWN_RIGHT" }, \ -- { DIKS_F1, "F1" }, \ -- { DIKS_F2, "F2" }, \ -- { DIKS_F3, "F3" }, \ -- { DIKS_F4, "F4" }, \ -- { DIKS_F5, "F5" }, \ -- { DIKS_F6, "F6" }, \ -- { DIKS_F7, "F7" }, \ -- { DIKS_F8, "F8" }, \ -- { DIKS_F9, "F9" }, \ -- { DIKS_F10, "F10" }, \ -- { DIKS_F11, "F11" }, \ -- { DIKS_F12, "F12" }, \ -- { DIKS_SHIFT, "SHIFT" }, \ -- { DIKS_CONTROL, "CONTROL" }, \ -- { DIKS_ALT, "ALT" }, \ -- { DIKS_ALTGR, "ALTGR" }, \ -- { DIKS_META, "META" }, \ -- { DIKS_SUPER, "SUPER" }, \ -- { DIKS_HYPER, "HYPER" }, \ -- { DIKS_CAPS_LOCK, "CAPS_LOCK" }, \ -- { DIKS_NUM_LOCK, "NUM_LOCK" }, \ -- { DIKS_SCROLL_LOCK, "SCROLL_LOCK" }, \ -- { DIKS_DEAD_ABOVEDOT, "DEAD_ABOVEDOT" }, \ -- { DIKS_DEAD_ABOVERING, "DEAD_ABOVERING" }, \ -- { DIKS_DEAD_ACUTE, "DEAD_ACUTE" }, \ -- { DIKS_DEAD_BREVE, "DEAD_BREVE" }, \ -- { DIKS_DEAD_CARON, "DEAD_CARON" }, \ -- { DIKS_DEAD_CEDILLA, "DEAD_CEDILLA" }, \ -- { DIKS_DEAD_CIRCUMFLEX, "DEAD_CIRCUMFLEX" }, \ -- { DIKS_DEAD_DIAERESIS, "DEAD_DIAERESIS" }, \ -- { DIKS_DEAD_DOUBLEACUTE, "DEAD_DOUBLEACUTE" }, \ -- { DIKS_DEAD_GRAVE, "DEAD_GRAVE" }, \ -- { DIKS_DEAD_IOTA, "DEAD_IOTA" }, \ -- { DIKS_DEAD_MACRON, "DEAD_MACRON" }, \ -- { DIKS_DEAD_OGONEK, "DEAD_OGONEK" }, \ -- { DIKS_DEAD_SEMIVOICED_SOUND, "DEAD_SEMIVOICED_SOUND" }, \ -- { DIKS_DEAD_TILDE, "DEAD_TILDE" }, \ -- { DIKS_DEAD_VOICED_SOUND, "DEAD_VOICED_SOUND" }, \ -- { DIKS_CUSTOM0, "CUSTOM0" }, \ -- { DIKS_CUSTOM1, "CUSTOM1" }, \ -- { DIKS_CUSTOM2, "CUSTOM2" }, \ -- { DIKS_CUSTOM3, "CUSTOM3" }, \ -- { DIKS_CUSTOM4, "CUSTOM4" }, \ -- { DIKS_CUSTOM5, "CUSTOM5" }, \ -- { DIKS_CUSTOM6, "CUSTOM6" }, \ -- { DIKS_CUSTOM7, "CUSTOM7" }, \ -- { DIKS_CUSTOM8, "CUSTOM8" }, \ -- { DIKS_CUSTOM9, "CUSTOM9" }, \ -- { DIKS_NULL, "NULL" } \ --}; -- --#define DirectFBKeyIdentifierNames(Identifier) struct DFBKeyIdentifierName { \ -- DFBInputDeviceKeyIdentifier identifier; \ -- const char *name; \ --} Identifier[] = { \ -- { DIKI_A, "A" }, \ -- { DIKI_B, "B" }, \ -- { DIKI_C, "C" }, \ -- { DIKI_D, "D" }, \ -- { DIKI_E, "E" }, \ -- { DIKI_F, "F" }, \ -- { DIKI_G, "G" }, \ -- { DIKI_H, "H" }, \ -- { DIKI_I, "I" }, \ -- { DIKI_J, "J" }, \ -- { DIKI_K, "K" }, \ -- { DIKI_L, "L" }, \ -- { DIKI_M, "M" }, \ -- { DIKI_N, "N" }, \ -- { DIKI_O, "O" }, \ -- { DIKI_P, "P" }, \ -- { DIKI_Q, "Q" }, \ -- { DIKI_R, "R" }, \ -- { DIKI_S, "S" }, \ -- { DIKI_T, "T" }, \ -- { DIKI_U, "U" }, \ -- { DIKI_V, "V" }, \ -- { DIKI_W, "W" }, \ -- { DIKI_X, "X" }, \ -- { DIKI_Y, "Y" }, \ -- { DIKI_Z, "Z" }, \ -- { DIKI_0, "0" }, \ -- { DIKI_1, "1" }, \ -- { DIKI_2, "2" }, \ -- { DIKI_3, "3" }, \ -- { DIKI_4, "4" }, \ -- { DIKI_5, "5" }, \ -- { DIKI_6, "6" }, \ -- { DIKI_7, "7" }, \ -- { DIKI_8, "8" }, \ -- { DIKI_9, "9" }, \ -- { DIKI_F1, "F1" }, \ -- { DIKI_F2, "F2" }, \ -- { DIKI_F3, "F3" }, \ -- { DIKI_F4, "F4" }, \ -- { DIKI_F5, "F5" }, \ -- { DIKI_F6, "F6" }, \ -- { DIKI_F7, "F7" }, \ -- { DIKI_F8, "F8" }, \ -- { DIKI_F9, "F9" }, \ -- { DIKI_F10, "F10" }, \ -- { DIKI_F11, "F11" }, \ -- { DIKI_F12, "F12" }, \ -- { DIKI_SHIFT_L, "SHIFT_L" }, \ -- { DIKI_SHIFT_R, "SHIFT_R" }, \ -- { DIKI_CONTROL_L, "CONTROL_L" }, \ -- { DIKI_CONTROL_R, "CONTROL_R" }, \ -- { DIKI_ALT_L, "ALT_L" }, \ -- { DIKI_ALT_R, "ALT_R" }, \ -- { DIKI_META_L, "META_L" }, \ -- { DIKI_META_R, "META_R" }, \ -- { DIKI_SUPER_L, "SUPER_L" }, \ -- { DIKI_SUPER_R, "SUPER_R" }, \ -- { DIKI_HYPER_L, "HYPER_L" }, \ -- { DIKI_HYPER_R, "HYPER_R" }, \ -- { DIKI_CAPS_LOCK, "CAPS_LOCK" }, \ -- { DIKI_NUM_LOCK, "NUM_LOCK" }, \ -- { DIKI_SCROLL_LOCK, "SCROLL_LOCK" }, \ -- { DIKI_ESCAPE, "ESCAPE" }, \ -- { DIKI_LEFT, "LEFT" }, \ -- { DIKI_RIGHT, "RIGHT" }, \ -- { DIKI_UP, "UP" }, \ -- { DIKI_DOWN, "DOWN" }, \ -- { DIKI_TAB, "TAB" }, \ -- { DIKI_ENTER, "ENTER" }, \ -- { DIKI_SPACE, "SPACE" }, \ -- { DIKI_BACKSPACE, "BACKSPACE" }, \ -- { DIKI_INSERT, "INSERT" }, \ -- { DIKI_DELETE, "DELETE" }, \ -- { DIKI_HOME, "HOME" }, \ -- { DIKI_END, "END" }, \ -- { DIKI_PAGE_UP, "PAGE_UP" }, \ -- { DIKI_PAGE_DOWN, "PAGE_DOWN" }, \ -- { DIKI_PRINT, "PRINT" }, \ -- { DIKI_PAUSE, "PAUSE" }, \ -- { DIKI_QUOTE_LEFT, "QUOTE_LEFT" }, \ -- { DIKI_MINUS_SIGN, "MINUS_SIGN" }, \ -- { DIKI_EQUALS_SIGN, "EQUALS_SIGN" }, \ -- { DIKI_BRACKET_LEFT, "BRACKET_LEFT" }, \ -- { DIKI_BRACKET_RIGHT, "BRACKET_RIGHT" }, \ -- { DIKI_BACKSLASH, "BACKSLASH" }, \ -- { DIKI_SEMICOLON, "SEMICOLON" }, \ -- { DIKI_QUOTE_RIGHT, "QUOTE_RIGHT" }, \ -- { DIKI_COMMA, "COMMA" }, \ -- { DIKI_PERIOD, "PERIOD" }, \ -- { DIKI_SLASH, "SLASH" }, \ -- { DIKI_LESS_SIGN, "LESS_SIGN" }, \ -- { DIKI_KP_DIV, "KP_DIV" }, \ -- { DIKI_KP_MULT, "KP_MULT" }, \ -- { DIKI_KP_MINUS, "KP_MINUS" }, \ -- { DIKI_KP_PLUS, "KP_PLUS" }, \ -- { DIKI_KP_ENTER, "KP_ENTER" }, \ -- { DIKI_KP_SPACE, "KP_SPACE" }, \ -- { DIKI_KP_TAB, "KP_TAB" }, \ -- { DIKI_KP_F1, "KP_F1" }, \ -- { DIKI_KP_F2, "KP_F2" }, \ -- { DIKI_KP_F3, "KP_F3" }, \ -- { DIKI_KP_F4, "KP_F4" }, \ -- { DIKI_KP_EQUAL, "KP_EQUAL" }, \ -- { DIKI_KP_SEPARATOR, "KP_SEPARATOR" }, \ -- { DIKI_KP_DECIMAL, "KP_DECIMAL" }, \ -- { DIKI_KP_0, "KP_0" }, \ -- { DIKI_KP_1, "KP_1" }, \ -- { DIKI_KP_2, "KP_2" }, \ -- { DIKI_KP_3, "KP_3" }, \ -- { DIKI_KP_4, "KP_4" }, \ -- { DIKI_KP_5, "KP_5" }, \ -- { DIKI_KP_6, "KP_6" }, \ -- { DIKI_KP_7, "KP_7" }, \ -- { DIKI_KP_8, "KP_8" }, \ -- { DIKI_KP_9, "KP_9" }, \ -- { DIKI_UNKNOWN, "UNKNOWN" } \ --}; -- --#endif ---- include/directfb_strings.h 2006-05-03 10:24:38.000000000 +0300 -+++ include/directfb_strings.h 1970-01-01 02:00:00.000000000 +0200 -@@ -1,278 +0,0 @@ --#ifndef __DIRECTFB_STRINGS_H__ --#define __DIRECTFB_STRINGS_H__ -- --#define DirectFBPixelFormatNames(Identifier) struct DFBPixelFormatName { \ -- DFBSurfacePixelFormat format; \ -- const char *name; \ --} Identifier[] = { \ -- { DSPF_ARGB1555, "ARGB1555" }, \ -- { DSPF_RGB16, "RGB16" }, \ -- { DSPF_RGB24, "RGB24" }, \ -- { DSPF_RGB32, "RGB32" }, \ -- { DSPF_ARGB, "ARGB" }, \ -- { DSPF_A8, "A8" }, \ -- { DSPF_YUY2, "YUY2" }, \ -- { DSPF_RGB332, "RGB332" }, \ -- { DSPF_UYVY, "UYVY" }, \ -- { DSPF_I420, "I420" }, \ -- { DSPF_YV12, "YV12" }, \ -- { DSPF_LUT8, "LUT8" }, \ -- { DSPF_ALUT44, "ALUT44" }, \ -- { DSPF_AiRGB, "AiRGB" }, \ -- { DSPF_A1, "A1" }, \ -- { DSPF_NV12, "NV12" }, \ -- { DSPF_NV16, "NV16" }, \ -- { DSPF_ARGB2554, "ARGB2554" }, \ -- { DSPF_ARGB4444, "ARGB4444" }, \ -- { DSPF_NV21, "NV21" }, \ -- { DSPF_AYUV, "AYUV" }, \ -- { DSPF_UNKNOWN, "UNKNOWN" } \ --}; -- --#define DirectFBInputDeviceTypeFlagsNames(Identifier) struct DFBInputDeviceTypeFlagsName { \ -- DFBInputDeviceTypeFlags type; \ -- const char *name; \ --} Identifier[] = { \ -- { DIDTF_KEYBOARD, "KEYBOARD" }, \ -- { DIDTF_MOUSE, "MOUSE" }, \ -- { DIDTF_JOYSTICK, "JOYSTICK" }, \ -- { DIDTF_REMOTE, "REMOTE" }, \ -- { DIDTF_VIRTUAL, "VIRTUAL" }, \ -- { DIDTF_NONE, "NONE" } \ --}; -- --#define DirectFBSurfaceDrawingFlagsNames(Identifier) struct DFBSurfaceDrawingFlagsName { \ -- DFBSurfaceDrawingFlags flag; \ -- const char *name; \ --} Identifier[] = { \ -- { DSDRAW_BLEND, "BLEND" }, \ -- { DSDRAW_DST_COLORKEY, "DST_COLORKEY" }, \ -- { DSDRAW_SRC_PREMULTIPLY, "SRC_PREMULTIPLY" }, \ -- { DSDRAW_DST_PREMULTIPLY, "DST_PREMULTIPLY" }, \ -- { DSDRAW_DEMULTIPLY, "DEMULTIPLY" }, \ -- { DSDRAW_XOR, "XOR" }, \ -- { DSDRAW_NOFX, "NOFX" } \ --}; -- --#define DirectFBSurfaceBlittingFlagsNames(Identifier) struct DFBSurfaceBlittingFlagsName { \ -- DFBSurfaceBlittingFlags flag; \ -- const char *name; \ --} Identifier[] = { \ -- { DSBLIT_BLEND_ALPHACHANNEL, "BLEND_ALPHACHANNEL" }, \ -- { DSBLIT_BLEND_COLORALPHA, "BLEND_COLORALPHA" }, \ -- { DSBLIT_COLORIZE, "COLORIZE" }, \ -- { DSBLIT_SRC_COLORKEY, "SRC_COLORKEY" }, \ -- { DSBLIT_DST_COLORKEY, "DST_COLORKEY" }, \ -- { DSBLIT_SRC_PREMULTIPLY, "SRC_PREMULTIPLY" }, \ -- { DSBLIT_DST_PREMULTIPLY, "DST_PREMULTIPLY" }, \ -- { DSBLIT_DEMULTIPLY, "DEMULTIPLY" }, \ -- { DSBLIT_DEINTERLACE, "DEINTERLACE" }, \ -- { DSBLIT_SRC_PREMULTCOLOR, "SRC_PREMULTCOLOR" }, \ -- { DSBLIT_XOR, "XOR" }, \ -- { DSBLIT_NOFX, "NOFX" } \ --}; -- --#define DirectFBInputDeviceCapabilitiesNames(Identifier) struct DFBInputDeviceCapabilitiesName { \ -- DFBInputDeviceCapabilities capability; \ -- const char *name; \ --} Identifier[] = { \ -- { DICAPS_KEYS, "KEYS" }, \ -- { DICAPS_AXES, "AXES" }, \ -- { DICAPS_BUTTONS, "BUTTONS" }, \ -- { DICAPS_NONE, "NONE" } \ --}; -- --#define DirectFBDisplayLayerTypeFlagsNames(Identifier) struct DFBDisplayLayerTypeFlagsName { \ -- DFBDisplayLayerTypeFlags type; \ -- const char *name; \ --} Identifier[] = { \ -- { DLTF_GRAPHICS, "GRAPHICS" }, \ -- { DLTF_VIDEO, "VIDEO" }, \ -- { DLTF_STILL_PICTURE, "STILL_PICTURE" }, \ -- { DLTF_BACKGROUND, "BACKGROUND" }, \ -- { DLTF_NONE, "NONE" } \ --}; -- --#define DirectFBDisplayLayerCapabilitiesNames(Identifier) struct DFBDisplayLayerCapabilitiesName { \ -- DFBDisplayLayerCapabilities capability; \ -- const char *name; \ --} Identifier[] = { \ -- { DLCAPS_SURFACE, "SURFACE" }, \ -- { DLCAPS_OPACITY, "OPACITY" }, \ -- { DLCAPS_ALPHACHANNEL, "ALPHACHANNEL" }, \ -- { DLCAPS_SCREEN_LOCATION, "SCREEN_LOCATION" }, \ -- { DLCAPS_FLICKER_FILTERING, "FLICKER_FILTERING" }, \ -- { DLCAPS_DEINTERLACING, "DEINTERLACING" }, \ -- { DLCAPS_SRC_COLORKEY, "SRC_COLORKEY" }, \ -- { DLCAPS_DST_COLORKEY, "DST_COLORKEY" }, \ -- { DLCAPS_BRIGHTNESS, "BRIGHTNESS" }, \ -- { DLCAPS_CONTRAST, "CONTRAST" }, \ -- { DLCAPS_HUE, "HUE" }, \ -- { DLCAPS_SATURATION, "SATURATION" }, \ -- { DLCAPS_LEVELS, "LEVELS" }, \ -- { DLCAPS_FIELD_PARITY, "FIELD_PARITY" }, \ -- { DLCAPS_WINDOWS, "WINDOWS" }, \ -- { DLCAPS_SOURCES, "SOURCES" }, \ -- { DLCAPS_ALPHA_RAMP, "ALPHA_RAMP" }, \ -- { DLCAPS_PREMULTIPLIED, "PREMULTIPLIED" }, \ -- { DLCAPS_SCREEN_POSITION, "SCREEN_POSITION" }, \ -- { DLCAPS_SCREEN_SIZE, "SCREEN_SIZE" }, \ -- { DLCAPS_NONE, "NONE" } \ --}; -- --#define DirectFBDisplayLayerBufferModeNames(Identifier) struct DFBDisplayLayerBufferModeName { \ -- DFBDisplayLayerBufferMode mode; \ -- const char *name; \ --} Identifier[] = { \ -- { DLBM_FRONTONLY, "FRONTONLY" }, \ -- { DLBM_BACKVIDEO, "BACKVIDEO" }, \ -- { DLBM_BACKSYSTEM, "BACKSYSTEM" }, \ -- { DLBM_TRIPLE, "TRIPLE" }, \ -- { DLBM_WINDOWS, "WINDOWS" }, \ -- { DLBM_UNKNOWN, "UNKNOWN" } \ --}; -- --#define DirectFBScreenCapabilitiesNames(Identifier) struct DFBScreenCapabilitiesName { \ -- DFBScreenCapabilities capability; \ -- const char *name; \ --} Identifier[] = { \ -- { DSCCAPS_VSYNC, "VSYNC" }, \ -- { DSCCAPS_POWER_MANAGEMENT, "POWER_MANAGEMENT" }, \ -- { DSCCAPS_MIXERS, "MIXERS" }, \ -- { DSCCAPS_ENCODERS, "ENCODERS" }, \ -- { DSCCAPS_OUTPUTS, "OUTPUTS" }, \ -- { DSCCAPS_NONE, "NONE" } \ --}; -- --#define DirectFBScreenEncoderCapabilitiesNames(Identifier) struct DFBScreenEncoderCapabilitiesName { \ -- DFBScreenEncoderCapabilities capability; \ -- const char *name; \ --} Identifier[] = { \ -- { DSECAPS_TV_STANDARDS, "TV_STANDARDS" }, \ -- { DSECAPS_TEST_PICTURE, "TEST_PICTURE" }, \ -- { DSECAPS_MIXER_SEL, "MIXER_SEL" }, \ -- { DSECAPS_OUT_SIGNALS, "OUT_SIGNALS" }, \ -- { DSECAPS_SCANMODE, "SCANMODE" }, \ -- { DSECAPS_BRIGHTNESS, "BRIGHTNESS" }, \ -- { DSECAPS_CONTRAST, "CONTRAST" }, \ -- { DSECAPS_HUE, "HUE" }, \ -- { DSECAPS_SATURATION, "SATURATION" }, \ -- { DSECAPS_NONE, "NONE" } \ --}; -- --#define DirectFBScreenEncoderTypeNames(Identifier) struct DFBScreenEncoderTypeName { \ -- DFBScreenEncoderType type; \ -- const char *name; \ --} Identifier[] = { \ -- { DSET_CRTC, "CRTC" }, \ -- { DSET_TV, "TV" }, \ -- { DSET_UNKNOWN, "UNKNOWN" } \ --}; -- --#define DirectFBScreenEncoderTVStandardsNames(Identifier) struct DFBScreenEncoderTVStandardsName { \ -- DFBScreenEncoderTVStandards standard; \ -- const char *name; \ --} Identifier[] = { \ -- { DSETV_PAL, "PAL" }, \ -- { DSETV_NTSC, "NTSC" }, \ -- { DSETV_SECAM, "SECAM" }, \ -- { DSETV_UNKNOWN, "UNKNOWN" } \ --}; -- --#define DirectFBScreenOutputCapabilitiesNames(Identifier) struct DFBScreenOutputCapabilitiesName { \ -- DFBScreenOutputCapabilities capability; \ -- const char *name; \ --} Identifier[] = { \ -- { DSOCAPS_CONNECTORS, "CONNECTORS" }, \ -- { DSOCAPS_ENCODER_SEL, "ENCODER_SEL" }, \ -- { DSOCAPS_SIGNAL_SEL, "SIGNAL_SEL" }, \ -- { DSOCAPS_CONNECTOR_SEL, "CONNECTOR_SEL" }, \ -- { DSOCAPS_NONE, "NONE" } \ --}; -- --#define DirectFBScreenOutputConnectorsNames(Identifier) struct DFBScreenOutputConnectorsName { \ -- DFBScreenOutputConnectors connector; \ -- const char *name; \ --} Identifier[] = { \ -- { DSOC_VGA, "VGA" }, \ -- { DSOC_SCART, "SCART" }, \ -- { DSOC_YC, "YC" }, \ -- { DSOC_CVBS, "CVBS" }, \ -- { DSOC_UNKNOWN, "UNKNOWN" } \ --}; -- --#define DirectFBScreenOutputSignalsNames(Identifier) struct DFBScreenOutputSignalsName { \ -- DFBScreenOutputSignals signal; \ -- const char *name; \ --} Identifier[] = { \ -- { DSOS_VGA, "VGA" }, \ -- { DSOS_YC, "YC" }, \ -- { DSOS_CVBS, "CVBS" }, \ -- { DSOS_RGB, "RGB" }, \ -- { DSOS_YCBCR, "YCBCR" }, \ -- { DSOS_NONE, "NONE" } \ --}; -- --#define DirectFBScreenMixerCapabilitiesNames(Identifier) struct DFBScreenMixerCapabilitiesName { \ -- DFBScreenMixerCapabilities capability; \ -- const char *name; \ --} Identifier[] = { \ -- { DSMCAPS_FULL, "FULL" }, \ -- { DSMCAPS_SUB_LEVEL, "SUB_LEVEL" }, \ -- { DSMCAPS_SUB_LAYERS, "SUB_LAYERS" }, \ -- { DSMCAPS_BACKGROUND, "BACKGROUND" }, \ -- { DSMCAPS_NONE, "NONE" } \ --}; -- --#define DirectFBScreenMixerTreeNames(Identifier) struct DFBScreenMixerTreeName { \ -- DFBScreenMixerTree tree; \ -- const char *name; \ --} Identifier[] = { \ -- { DSMT_FULL, "FULL" }, \ -- { DSMT_SUB_LEVEL, "SUB_LEVEL" }, \ -- { DSMT_SUB_LAYERS, "SUB_LAYERS" }, \ -- { DSMT_UNKNOWN, "UNKNOWN" } \ --}; -- --#define DirectFBScreenEncoderTestPictureNames(Identifier) struct DFBScreenEncoderTestPictureName { \ -- DFBScreenEncoderTestPicture test_picture; \ -- const char *name; \ --} Identifier[] = { \ -- { DSETP_MULTI, "MULTI" }, \ -- { DSETP_SINGLE, "SINGLE" }, \ -- { DSETP_WHITE, "WHITE" }, \ -- { DSETP_YELLOW, "YELLOW" }, \ -- { DSETP_CYAN, "CYAN" }, \ -- { DSETP_GREEN, "GREEN" }, \ -- { DSETP_MAGENTA, "MAGENTA" }, \ -- { DSETP_RED, "RED" }, \ -- { DSETP_BLUE, "BLUE" }, \ -- { DSETP_BLACK, "BLACK" }, \ -- { DSETP_OFF, "OFF" } \ --}; -- --#define DirectFBScreenEncoderScanModeNames(Identifier) struct DFBScreenEncoderScanModeName { \ -- DFBScreenEncoderScanMode scan_mode; \ -- const char *name; \ --} Identifier[] = { \ -- { DSESM_INTERLACED, "INTERLACED" }, \ -- { DSESM_PROGRESSIVE, "PROGRESSIVE" }, \ -- { DSESM_UNKNOWN, "UNKNOWN" } \ --}; -- --#define DirectFBAccelerationMaskNames(Identifier) struct DFBAccelerationMaskName { \ -- DFBAccelerationMask mask; \ -- const char *name; \ --} Identifier[] = { \ -- { DFXL_FILLRECTANGLE, "FILLRECTANGLE" }, \ -- { DFXL_DRAWRECTANGLE, "DRAWRECTANGLE" }, \ -- { DFXL_DRAWLINE, "DRAWLINE" }, \ -- { DFXL_FILLTRIANGLE, "FILLTRIANGLE" }, \ -- { DFXL_BLIT, "BLIT" }, \ -- { DFXL_STRETCHBLIT, "STRETCHBLIT" }, \ -- { DFXL_TEXTRIANGLES, "TEXTRIANGLES" }, \ -- { DFXL_DRAWSTRING, "DRAWSTRING" }, \ -- { DFXL_NONE, "NONE" } \ --}; -- --#endif - --- directfb-0.9.25.1/debian/changelog +++ directfb-0.9.26~cvs20060815/debian/changelog @@ -1,3 +1,13 @@ +directfb (0.9.26~cvs20060815-0.1) experimental; urgency=low + + * Non-maintainer upload. + * New upstream CVS snapshot pre 0.9.26 as we need newer API for Gtk 2.10 + DirectFB. + - Target at experimental. + - Drop 24_distclean patch. + + -- Loic Minier <[EMAIL PROTECTED]> Tue, 15 Aug 2006 22:35:46 +0200 + directfb (0.9.25.1-3) unstable; urgency=medium * Fix build failure on powerpc, due to the inconditional use of PAGE_SIZE.