Package: libdirectfb-dev
Version: 0.9.25.1-5
Severity: important
Tags: patch

directfb-config generates wrong linking options for
imageprovider/font/videoprovider. It basically uses not enough capitals.

Attached patch fixes this. For videoprovider I'm not 100% sure because
three of the four affected modules are not in debian.

grts Tim

-- System Information:
Debian Release: 4.0
  APT prefers testing
  APT policy: (900, 'testing'), (20, 'unstable'), (19, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/dash
Kernel: Linux 2.6.19
Locale: LANG=C, LC_CTYPE=C (charmap=UTF-8) (ignored: LC_ALL set to nl_NL.utf8)

Versions of packages libdirectfb-dev depends on:
ii  libdirectfb-0.9-25        0.9.25.1-5     direct frame buffer graphics - sha
ii  libdirectfb-extra         0.9.25.1-5     direct frame buffer graphics - ext
ii  libfreetype6-dev          2.2.1-5        FreeType 2 font engine, developmen
ii  libjpeg62-dev             6b-13          Development files for the IJG JPEG
ii  libmpeg3-dev              1.5.4-5        Headers and static libraries for l
ii  libpng12-dev              1.2.15~beta5-1 PNG library - development
ii  libx11-dev                2:1.0.3-4      X11 client-side library (developme
ii  libxext-dev               1:1.0.1-2      X11 miscellaneous extensions libra
ii  x11proto-core-dev         7.0.7-2        X11 core wire protocol and auxilia
ii  zlib1g-dev                1:1.2.3-13     compression library - development

libdirectfb-dev recommends no packages.

-- no debconf information
--- /home/tdykstra/directfb-config      2007-01-22 13:50:04.000000000 +0100
+++ /usr/bin/directfb-config    2007-01-22 14:45:26.000000000 +0100
@@ -113,11 +113,14 @@
       fi
         
       for i in `echo $optarg | sed 's/,/ /g'`; do
-        echo_font="$echo_font -Wl,-uidirectfbfont_$i 
$moduledir/interfaces/IDirectFBFont/libidirectfbfont_$i.a"
+        echo_font="$echo_font 
$moduledir/interfaces/IDirectFBFont/libidirectfbfont_$i.a -Wl,-uIDirectFBFont_"
         case $i in
           ft2)
-            echo_font="$echo_font -lfreetype"
+            echo_font="${echo_font}FT2 -lfreetype"
             ;;
+         default)
+            echo_font="${echo_font}Default -lfreetype"
+           ;;
         esac
       done
 
@@ -164,21 +167,22 @@
       fi
         
       for i in `echo $optarg | sed 's/,/ /g'`; do
-        echo_imageprovider="$echo_imageprovider 
-Wl,-uidirectfbimageprovider_$i 
$moduledir/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_$i.a"
+        echo_imageprovider="$echo_imageprovider 
$moduledir/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_$i.a 
-Wl,-uIDirectFBImageProvider_"
         case $i in
           imlib2)
             echo_imageprovider="$echo_imageprovider -lImlib2 -lttf -lm 
-L/usr/X11R6/lib -lXext -lX11"
             ;;
           jpeg)
-            echo_imageprovider="$echo_imageprovider -ljpeg"
+            echo_imageprovider="${echo_imageprovider}JPEG -ljpeg"
             ;;
           png)
-            echo_imageprovider="$echo_imageprovider -lpng -lz -lm"
+            echo_imageprovider="${echo_imageprovider}PNG -lpng -lz -lm"
             ;;
           gif)
+            echo_imageprovider="${echo_imageprovider}GIF -lm"
             ;;
           mpeg2)
-            echo_imageprovider="$echo_imageprovider -lm"
+            echo_imageprovider="${echo_imageprovider}MPEG2 -lm"
             ;;
         esac
       done
@@ -191,16 +195,19 @@
       fi
         
       for i in `echo $optarg | sed 's/,/ /g'`; do
-        echo_videoprovider="$echo_videoprovider 
-Wl,-uidirectfbvideoprovider_$i 
$moduledir/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_$i.a"
+        echo_videoprovider="$echo_videoprovider 
$moduledir/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_$i.a 
-Wl,-uIDirectFBVideoProvider_"
         case $i in
+         v4l)
+           echo_videoprovider="${echo_videoprovider}_V4l -lmpeg3"
+           ;;
           libmpeg3)
-            echo_videoprovider="$echo_videoprovider -lmpeg3"
+            echo_videoprovider="${echo_videoprovider}_LIBMPEG3 -lmpeg3"
             ;;
           swf)
-            echo_videoprovider="$echo_videoprovider -ljpeg -lz"
+            echo_videoprovider="${echo_videoprovider}_SWF -ljpeg -lz"
             ;;
           openquicktime)
-            echo_videoprovider="$echo_videoprovider -lopenquicktime -lz -lglib 
-lm"
+            echo_videoprovider="${echo_videoprovider}_OPENQUICKTIME 
-lopenquicktime -lz -lglib -lm"
             ;;
         esac
       done

Reply via email to