ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Juergen Daubert 2007-11-11 10:49:06 +01:00
commit 4a5fe2e26b
31 changed files with 1026 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
directfb/.footprint
View File

@ -7,7 +7,6 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/dfblayer
-rwxr-xr-x root/root usr/bin/dfbpenmount
-rwxr-xr-x root/root usr/bin/dfbscreen
-rwxr-xr-x root/root usr/bin/dfbsummon
-rwxr-xr-x root/root usr/bin/directfb-config
-rwxr-xr-x root/root usr/bin/directfb-csource
-rwxr-xr-x root/root usr/bin/mkdfiff
@ -37,8 +36,9 @@ drwxr-xr-x root/root usr/include/directfb-internal/core/
-rw-r--r-- root/root usr/include/directfb-internal/core/screens.h
-rw-r--r-- root/root usr/include/directfb-internal/core/screens_internal.h
-rw-r--r-- root/root usr/include/directfb-internal/core/state.h
-rw-r--r-- root/root usr/include/directfb-internal/core/surfacemanager.h
-rw-r--r-- root/root usr/include/directfb-internal/core/surfaces.h
-rw-r--r-- root/root usr/include/directfb-internal/core/surface.h
-rw-r--r-- root/root usr/include/directfb-internal/core/surface_buffer.h
-rw-r--r-- root/root usr/include/directfb-internal/core/surface_pool.h
-rw-r--r-- root/root usr/include/directfb-internal/core/system.h
-rw-r--r-- root/root usr/include/directfb-internal/core/windows.h
-rw-r--r-- root/root usr/include/directfb-internal/core/windows_internal.h
@ -56,6 +56,7 @@ drwxr-xr-x root/root usr/include/directfb-internal/fbdev/
-rw-r--r-- root/root usr/include/directfb-internal/fbdev/agp.h
-rw-r--r-- root/root usr/include/directfb-internal/fbdev/fb.h
-rw-r--r-- root/root usr/include/directfb-internal/fbdev/fbdev.h
-rw-r--r-- root/root usr/include/directfb-internal/fbdev/surfacemanager.h
-rw-r--r-- root/root usr/include/directfb-internal/fbdev/vt.h
drwxr-xr-x root/root usr/include/directfb-internal/gfx/
-rw-r--r-- root/root usr/include/directfb-internal/gfx/clip.h
@ -125,6 +126,7 @@ drwxr-xr-x root/root usr/include/directfb/fusion/
-rw-r--r-- root/root usr/include/directfb/fusion/lock.h
-rw-r--r-- root/root usr/include/directfb/fusion/object.h
-rw-r--r-- root/root usr/include/directfb/fusion/property.h
-rw-r--r-- root/root usr/include/directfb/fusion/protocol.h
-rw-r--r-- root/root usr/include/directfb/fusion/reactor.h
-rw-r--r-- root/root usr/include/directfb/fusion/ref.h
drwxr-xr-x root/root usr/include/directfb/fusion/shm/
@ -135,103 +137,79 @@ drwxr-xr-x root/root usr/include/directfb/fusion/shm/
-rw-r--r-- root/root usr/include/directfb/fusion/types.h
-rw-r--r-- root/root usr/include/directfb/fusion/vector.h
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/directfb-1.0-0/
drwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_ati128.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_ati128.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_cyber5k.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_cyber5k.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_i810.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_i810.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_i830.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_i830.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_mach64.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_mach64.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_matrox.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_matrox.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_neomagic.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_neomagic.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_nsc.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_nsc.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_nvidia.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_nvidia.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_radeon.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_radeon.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_savage.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_savage.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_sis315.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_sis315.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_tdfx.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_tdfx.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_unichrome.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/gfxdrivers/libdirectfb_unichrome.so
drwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_joystick.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_joystick.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_keyboard.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_keyboard.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_linux_input.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_linux_input.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_lirc.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_lirc.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_mutouch.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_mutouch.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_penmount.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_penmount.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_ps2mouse.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_ps2mouse.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_sdlinput.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_sdlinput.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_serialmouse.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_serialmouse.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_sonypi.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_sonypi.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_wm97xx_ts.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/inputdrivers/libdirectfb_wm97xx_ts.so
drwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/
drwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBFont/
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBFont/libidirectfbfont_default.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBFont/libidirectfbfont_default.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
drwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBImageProvider/
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
drwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBVideoProvider/
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
drwxr-xr-x root/root usr/lib/directfb-1.0-0/systems/
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/systems/libdirectfb_fbdev.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/systems/libdirectfb_fbdev.so
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/systems/libdirectfb_sdl.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/systems/libdirectfb_sdl.so
drwxr-xr-x root/root usr/lib/directfb-1.0-0/wm/
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/wm/libdirectfbwm_default.la
-rwxr-xr-x root/root usr/lib/directfb-1.0-0/wm/libdirectfbwm_default.so
lrwxrwxrwx root/root usr/lib/libdirect-1.0.so.0 -> libdirect-1.0.so.0.0.0
-rwxr-xr-x root/root usr/lib/libdirect-1.0.so.0.0.0
drwxr-xr-x root/root usr/lib/directfb-1.1-0/
drwxr-xr-x root/root usr/lib/directfb-1.1-0/gfxdrivers/
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_mach64.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_mach64.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_matrox.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_matrox.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_radeon.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_radeon.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_vmware.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/gfxdrivers/libdirectfb_vmware.so
drwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_joystick.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_joystick.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_keyboard.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_keyboard.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_linux_input.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_linux_input.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_lirc.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_lirc.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_mutouch.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_mutouch.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_penmount.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_penmount.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_ps2mouse.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_ps2mouse.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_serialmouse.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_serialmouse.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_sonypi.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_sonypi.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_wm97xx_ts.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_wm97xx_ts.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_x11input.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/inputdrivers/libdirectfb_x11input.so
drwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/
drwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBFont/
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_default.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_default.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
drwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
drwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBVideoProvider/
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
drwxr-xr-x root/root usr/lib/directfb-1.1-0/systems/
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/systems/libdirectfb_fbdev.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/systems/libdirectfb_fbdev.so
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/systems/libdirectfb_x11.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/systems/libdirectfb_x11.so
drwxr-xr-x root/root usr/lib/directfb-1.1-0/wm/
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/wm/libdirectfbwm_default.la
-rwxr-xr-x root/root usr/lib/directfb-1.1-0/wm/libdirectfbwm_default.so
lrwxrwxrwx root/root usr/lib/libdirect-1.1.so.0 -> libdirect-1.1.so.0.0.0
-rwxr-xr-x root/root usr/lib/libdirect-1.1.so.0.0.0
-rwxr-xr-x root/root usr/lib/libdirect.la
lrwxrwxrwx root/root usr/lib/libdirect.so -> libdirect-1.0.so.0.0.0
lrwxrwxrwx root/root usr/lib/libdirectfb-1.0.so.0 -> libdirectfb-1.0.so.0.0.0
-rwxr-xr-x root/root usr/lib/libdirectfb-1.0.so.0.0.0
lrwxrwxrwx root/root usr/lib/libdirect.so -> libdirect-1.1.so.0.0.0
lrwxrwxrwx root/root usr/lib/libdirectfb-1.1.so.0 -> libdirectfb-1.1.so.0.0.0
-rwxr-xr-x root/root usr/lib/libdirectfb-1.1.so.0.0.0
-rwxr-xr-x root/root usr/lib/libdirectfb.la
lrwxrwxrwx root/root usr/lib/libdirectfb.so -> libdirectfb-1.0.so.0.0.0
lrwxrwxrwx root/root usr/lib/libfusion-1.0.so.0 -> libfusion-1.0.so.0.0.0
-rwxr-xr-x root/root usr/lib/libfusion-1.0.so.0.0.0
lrwxrwxrwx root/root usr/lib/libdirectfb.so -> libdirectfb-1.1.so.0.0.0
lrwxrwxrwx root/root usr/lib/libfusion-1.1.so.0 -> libfusion-1.1.so.0.0.0
-rwxr-xr-x root/root usr/lib/libfusion-1.1.so.0.0.0
-rwxr-xr-x root/root usr/lib/libfusion.la
lrwxrwxrwx root/root usr/lib/libfusion.so -> libfusion-1.0.so.0.0.0
lrwxrwxrwx root/root usr/lib/libfusion.so -> libfusion-1.1.so.0.0.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/direct.pc
-rw-r--r-- root/root usr/lib/pkgconfig/directfb-internal.pc
@ -244,5 +222,5 @@ drwxr-xr-x root/root usr/man/man1/
drwxr-xr-x root/root usr/man/man5/
-rw-r--r-- root/root usr/man/man5/directfbrc.5.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/directfb-1.0.0/
-rw-r--r-- root/root usr/share/directfb-1.0.0/cursor.dat
drwxr-xr-x root/root usr/share/directfb-1.1.0/
-rw-r--r-- root/root usr/share/directfb-1.1.0/cursor.dat

2
directfb/.md5sum
View File

@ -1 +1 @@
ad746c49dc89ba6f99df71b17bbb1dc8 DirectFB-1.0.0.tar.gz
da30fa2748c7501913c8832a83e654ab DirectFB-1.1.0.tar.gz

2
directfb/Pkgfile
View File

@ -3,7 +3,7 @@
# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
name=directfb
version=1.0.0
version=1.1.0
release=1
source=(http://www.directfb.org/downloads/Core/DirectFB-$version.tar.gz)

2
fcron/.md5sum
View File

@ -1,3 +1,3 @@
646ff958524a01da4069b33c5b48b52a fcron
c85e6eecd0564f37658ae250a491fd31 fcron-3.0.3.src.tar.gz
5a26a1dfd91fdc7e87401e98aef870e6 fcron-3.0.4.src.tar.gz
39072065ed7a9ea70bc40308f622ebcf root.orig

2
fcron/Pkgfile
View File

@ -3,7 +3,7 @@
# Maintainer: Jürgen Daubert, juergen dot daubert at t-online dot de
name=fcron
version=3.0.3
version=3.0.4
release=1
source=(http://fcron.free.fr/archives/$name-$version.src.tar.gz \
fcron root.orig)

24
glib/.footprint
View File

@ -89,21 +89,21 @@ drwxr-xr-x root/root usr/lib/glib-2.0/
drwxr-xr-x root/root usr/lib/glib-2.0/include/
-rw-r--r-- root/root usr/lib/glib-2.0/include/glibconfig.h
-rwxr-xr-x root/root usr/lib/libglib-2.0.la
lrwxrwxrwx root/root usr/lib/libglib-2.0.so -> libglib-2.0.so.0.1400.2
lrwxrwxrwx root/root usr/lib/libglib-2.0.so.0 -> libglib-2.0.so.0.1400.2
-rwxr-xr-x root/root usr/lib/libglib-2.0.so.0.1400.2
lrwxrwxrwx root/root usr/lib/libglib-2.0.so -> libglib-2.0.so.0.1400.3
lrwxrwxrwx root/root usr/lib/libglib-2.0.so.0 -> libglib-2.0.so.0.1400.3
-rwxr-xr-x root/root usr/lib/libglib-2.0.so.0.1400.3
-rwxr-xr-x root/root usr/lib/libgmodule-2.0.la
lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so -> libgmodule-2.0.so.0.1400.2
lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.1400.2
-rwxr-xr-x root/root usr/lib/libgmodule-2.0.so.0.1400.2
lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so -> libgmodule-2.0.so.0.1400.3
lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.1400.3
-rwxr-xr-x root/root usr/lib/libgmodule-2.0.so.0.1400.3
-rwxr-xr-x root/root usr/lib/libgobject-2.0.la
lrwxrwxrwx root/root usr/lib/libgobject-2.0.so -> libgobject-2.0.so.0.1400.2
lrwxrwxrwx root/root usr/lib/libgobject-2.0.so.0 -> libgobject-2.0.so.0.1400.2
-rwxr-xr-x root/root usr/lib/libgobject-2.0.so.0.1400.2
lrwxrwxrwx root/root usr/lib/libgobject-2.0.so -> libgobject-2.0.so.0.1400.3
lrwxrwxrwx root/root usr/lib/libgobject-2.0.so.0 -> libgobject-2.0.so.0.1400.3
-rwxr-xr-x root/root usr/lib/libgobject-2.0.so.0.1400.3
-rwxr-xr-x root/root usr/lib/libgthread-2.0.la
lrwxrwxrwx root/root usr/lib/libgthread-2.0.so -> libgthread-2.0.so.0.1400.2
lrwxrwxrwx root/root usr/lib/libgthread-2.0.so.0 -> libgthread-2.0.so.0.1400.2
-rwxr-xr-x root/root usr/lib/libgthread-2.0.so.0.1400.2
lrwxrwxrwx root/root usr/lib/libgthread-2.0.so -> libgthread-2.0.so.0.1400.3
lrwxrwxrwx root/root usr/lib/libgthread-2.0.so.0 -> libgthread-2.0.so.0.1400.3
-rwxr-xr-x root/root usr/lib/libgthread-2.0.so.0.1400.3
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/glib-2.0.pc
-rw-r--r-- root/root usr/lib/pkgconfig/gmodule-2.0.pc

2
glib/.md5sum
View File

@ -1 +1 @@
fca5d26c8efea4e6e547c81c801bf67c glib-2.14.2.tar.bz2
d6e695a2dc96dcdd9d120d8efe265862 glib-2.14.3.tar.bz2

2
glib/Pkgfile
View File

@ -3,7 +3,7 @@
# Maintainer: Matt Housh, jaeger at crux dot nu
name=glib
version=2.14.2
version=2.14.3
release=1
source=(ftp://ftp.gtk.org/pub/$name/2.14/$name-$version.tar.bz2)

2
mod_php/.md5sum
View File

@ -1 +1 @@
55c97a671fdabf462cc7a82971a656d2 php-5.2.4.tar.bz2
1fe14ca892460b09f06729941a1bb605 php-5.2.5.tar.bz2

2
mod_php/Pkgfile
View File

@ -5,7 +5,7 @@
# Group: apache
name=mod_php
version=5.2.4
version=5.2.5
release=1
source=(http://www.php.net/distributions/php-$version.tar.bz2)

2
sudo/.md5sum
View File

@ -1 +1 @@
1f262526f321af388b37e05ee57bb2c7 sudo-1.6.9p6.tar.gz
67a7f95664e9f3926dc3e36d8684f921 sudo-1.6.9p8.tar.gz

2
sudo/Pkgfile
View File

@ -5,7 +5,7 @@
# Depends on:
name=sudo
version=1.6.9p6
version=1.6.9p8
release=1
source=(http://www.sudo.ws/$name/dist/$name-$version.tar.gz)

12
wine/.footprint
View File

@ -152,6 +152,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
-rw-r--r-- root/root usr/include/wine/windows/ddk/ntddser.h
-rw-r--r-- root/root usr/include/wine/windows/ddk/ntddtape.h
-rw-r--r-- root/root usr/include/wine/windows/ddk/wdm.h
-rw-r--r-- root/root usr/include/wine/windows/ddk/winddiui.h
-rw-r--r-- root/root usr/include/wine/windows/ddk/winsplp.h
-rw-r--r-- root/root usr/include/wine/windows/ddraw.h
-rw-r--r-- root/root usr/include/wine/windows/ddrawi.h
@ -244,6 +245,10 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
-rw-r--r-- root/root usr/include/wine/windows/idispids.h
-rw-r--r-- root/root usr/include/wine/windows/imagehlp.h
-rw-r--r-- root/root usr/include/wine/windows/imm.h
-rw-r--r-- root/root usr/include/wine/windows/imnact.h
-rw-r--r-- root/root usr/include/wine/windows/imnact.idl
-rw-r--r-- root/root usr/include/wine/windows/imnxport.h
-rw-r--r-- root/root usr/include/wine/windows/imnxport.idl
-rw-r--r-- root/root usr/include/wine/windows/indexsrv.h
-rw-r--r-- root/root usr/include/wine/windows/indexsrv.idl
-rw-r--r-- root/root usr/include/wine/windows/initguid.h
@ -285,8 +290,11 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
-rw-r--r-- root/root usr/include/wine/windows/mediaerr.h
-rw-r--r-- root/root usr/include/wine/windows/mediaobj.h
-rw-r--r-- root/root usr/include/wine/windows/mediaobj.idl
-rw-r--r-- root/root usr/include/wine/windows/midles.h
-rw-r--r-- root/root usr/include/wine/windows/mimeinfo.h
-rw-r--r-- root/root usr/include/wine/windows/mimeinfo.idl
-rw-r--r-- root/root usr/include/wine/windows/mimeole.h
-rw-r--r-- root/root usr/include/wine/windows/mimeole.idl
-rw-r--r-- root/root usr/include/wine/windows/minmax.h
-rw-r--r-- root/root usr/include/wine/windows/mlang.h
-rw-r--r-- root/root usr/include/wine/windows/mlang.idl
@ -535,6 +543,7 @@ drwxr-xr-x root/root usr/lib/wine/
-rwxr-xr-x root/root usr/lib/wine/crypt32.dll.so
-rwxr-xr-x root/root usr/lib/wine/cryptdll.dll.so
-rwxr-xr-x root/root usr/lib/wine/cryptnet.dll.so
-rwxr-xr-x root/root usr/lib/wine/ctapi32.dll.so
-rw-r--r-- root/root usr/lib/wine/ctl3d.dll16
-rwxr-xr-x root/root usr/lib/wine/ctl3d32.dll.so
-rw-r--r-- root/root usr/lib/wine/ctl3dv2.dll16
@ -599,6 +608,7 @@ drwxr-xr-x root/root usr/lib/wine/
-rwxr-xr-x root/root usr/lib/wine/imagehlp.dll.so
-rw-r--r-- root/root usr/lib/wine/imm.dll16
-rwxr-xr-x root/root usr/lib/wine/imm32.dll.so
-rwxr-xr-x root/root usr/lib/wine/inetcomm.dll.so
-rwxr-xr-x root/root usr/lib/wine/infosoft.dll.so
-rwxr-xr-x root/root usr/lib/wine/inkobj.dll.so
-rwxr-xr-x root/root usr/lib/wine/inseng.dll.so
@ -657,6 +667,7 @@ drwxr-xr-x root/root usr/lib/wine/
-rw-r--r-- root/root usr/lib/wine/libicmp.def
-rw-r--r-- root/root usr/lib/wine/libimagehlp.def
-rw-r--r-- root/root usr/lib/wine/libimm32.def
-rw-r--r-- root/root usr/lib/wine/libinetcomm.def
-rw-r--r-- root/root usr/lib/wine/libiphlpapi.def
-rw-r--r-- root/root usr/lib/wine/libkernel32.def
-rw-r--r-- root/root usr/lib/wine/liblz32.def
@ -762,6 +773,7 @@ drwxr-xr-x root/root usr/lib/wine/
-rwxr-xr-x root/root usr/lib/wine/msacm32.dll.so
-rwxr-xr-x root/root usr/lib/wine/msacm32.drv.so
-rwxr-xr-x root/root usr/lib/wine/msadp32.acm.so
-rwxr-xr-x root/root usr/lib/wine/mscat32.dll.so
-rwxr-xr-x root/root usr/lib/wine/mscms.dll.so
-rwxr-xr-x root/root usr/lib/wine/mscoree.dll.so
-rwxr-xr-x root/root usr/lib/wine/msdmo.dll.so

2
wine/.md5sum
View File

@ -1 +1 @@
e2cc11fe7ec7769bcf8fe4f59b1dd75a wine-0.9.48.tar.bz2
417912f28e48ddc6c4285a493d070564 wine-0.9.49.tar.bz2

2
wine/Pkgfile
View File

@ -5,7 +5,7 @@
# Depends on: fontforge
name=wine
version=0.9.48
version=0.9.49
release=1
source=(http://ibiblio.org/pub/linux/system/emulators/wine/wine-$version.tar.bz2)

22
x11-fonts-artwiz-aleczapka/.footprint
View File

@ -1,22 +0,0 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/fonts/
drwxr-xr-x root/root usr/share/fonts/artwiz-aleczapka/
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/anorexia.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/aqui.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/cure.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/cursor.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/drift.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/edges.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/fkp.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/fonts.alias
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/gelly.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/glisp-bold.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/glisp.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/kates.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/lime.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/mints-mild.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/mints-strong.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/nu.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/smoothansi.pcf
-rw-r--r-- root/root usr/share/fonts/artwiz-aleczapka/snap.pcf

34
x11-fonts-artwiz-aleczapka/README
View File

@ -1,34 +0,0 @@
REQUIREMENTS
x11
PRE-INSTALL
POST-INSTALL
1. add the artwiz-aleczapka directory to your fontpath
in the xorg.conf file:
---snip---
..
Section "Files"
..
FontPath "/usr/share/fonts/artwiz-aleczapka/"
EndSection
..
---snip---
2. create a font info database for the new fonts
# cd /usr/share/fonts/artwiz-aleczapka/
# mkfontdir
# fc-cache -f
3. restart X or rehash the font path like so:
# xset fp rehash
PRECAUTION

35
x11-fonts-corefonts/.footprint
View File

@ -1,35 +0,0 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/fonts/
drwxr-xr-x root/root usr/share/fonts/corefonts/
-rw-r--r-- root/root usr/share/fonts/corefonts/andalemo.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/arial.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/arialbd.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/arialbi.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/ariali.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/ariblk.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/comic.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/comicbd.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/cour.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/courbd.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/courbi.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/couri.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/georgia.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/georgiab.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/georgiai.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/georgiaz.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/impact.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/tahoma.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/times.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/timesbd.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/timesbi.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/timesi.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/trebuc.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/trebucbd.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/trebucbi.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/trebucit.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/verdana.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/verdanab.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/verdanai.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/verdanaz.ttf
-rw-r--r-- root/root usr/share/fonts/corefonts/webdings.ttf

48
x11-fonts-corefonts/README
View File

@ -1,48 +0,0 @@
REQUIREMENTS
freetype, x11
PRE-INSTALL
POST-INSTALL
1. Load "freetype" module in xorg.conf:
---snip---
..
Section "Module"
..
Load "freetype"
EndSection
..
---snip---
2. add the truetype directory to your fontpath in
the xorg.conf file:
---snip---
..
Section "Files"
..
FontPath "/usr/share/fonts/corefonts/"
EndSection
..
---snip---
3. create a font info database for the new fonts
# cd /usr/share/fonts/corefonts/
# mkfontscale
# mkfontdir
# fc-cache -f
4. restart X or rehash the font path like so:
# xset fp rehash
PRECAUTION

22
xorg-font-artwiz-aleczapka/.footprint Normal file
View File

@ -0,0 +1,22 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/X11/
drwxr-xr-x root/root usr/lib/X11/fonts/
drwxr-xr-x root/root usr/lib/X11/fonts/artwiz-aleczapka/
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/anorexia.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/aqui.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/cure.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/cursor.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/drift.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/edges.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/fkp.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/gelly.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/glisp-bold.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/glisp.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/kates.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/lime.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/mints-mild.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/mints-strong.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/nu.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/smoothansi.pcf
-rw-r--r-- root/root usr/lib/X11/fonts/artwiz-aleczapka/snap.pcf

0
x11-fonts-artwiz-aleczapka/.md5sum → xorg-font-artwiz-aleczapka/.md5sum
View File

11
x11-fonts-artwiz-aleczapka/Pkgfile → xorg-font-artwiz-aleczapka/Pkgfile
View File

@ -1,17 +1,16 @@
# Description: Artwiz X fonts revisited
# URL: http://artwizaleczapka.sourceforge.net/
# Maintainer: Matt Housh, jaeger at morpheus dot net
# Depends on: x11
# Depends on: xorg-mkfontdir, xorg-mkfontscale
name=x11-fonts-artwiz-aleczapka
name=xorg-font-artwiz-aleczapka
version=1.3
release=1
source=(http://dl.sourceforge.net/sourceforge/artwizaleczapka/artwiz-aleczapka-en-1.3.tar.bz2)
build() {
mkdir -p $PKG/usr/share/fonts/artwiz-aleczapka
mkdir -p $PKG/usr/lib/X11/fonts/artwiz-aleczapka
cd artwiz-aleczapka-en-1.3
install -o root -g root -m 0644 *.pcf $PKG/usr/share/fonts/artwiz-aleczapka/
install -o root -g root -m 0644 fonts.alias \
$PKG/usr/share/fonts/artwiz-aleczapka/
install -o root -g root -m 0644 *.pcf \
$PKG/usr/lib/X11/fonts/artwiz-aleczapka/
}

4
xorg-font-artwiz-aleczapka/post-install Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
mkfontdir /usr/lib/X11/fonts/artwiz-aleczapka
mkfontscale /usr/lib/X11/fonts/artwiz-aleczapka

36
xorg-font-msttcorefonts/.footprint Normal file
View File

@ -0,0 +1,36 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/X11/
drwxr-xr-x root/root usr/lib/X11/fonts/
drwxr-xr-x root/root usr/lib/X11/fonts/msttcorefonts/
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/andalemo.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/arial.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/arialbd.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/arialbi.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/ariali.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/ariblk.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/comic.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/comicbd.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/cour.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/courbd.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/courbi.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/couri.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/georgia.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/georgiab.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/georgiai.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/georgiaz.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/impact.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/tahoma.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/times.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/timesbd.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/timesbi.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/timesi.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/trebuc.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/trebucbd.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/trebucbi.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/trebucit.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/verdana.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/verdanab.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/verdanai.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/verdanaz.ttf
-rw-r--r-- root/root usr/lib/X11/fonts/msttcorefonts/webdings.ttf

2
x11-fonts-corefonts/.md5sum → xorg-font-msttcorefonts/.md5sum
View File

@ -1,7 +1,7 @@
cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe
9637df0e91703179f0723ec095a36cb5 arial32.exe
c9089ae0c3b3d0d8c4b0a95979bb9ff0 arialb32.exe
f4b729c0be7d288660f4fc167de199a1 cabextract-1.1.tar.gz
dc421a690648b503265c82ade84e143e cabextract-1.2.tar.gz
2b30de40bb5e803a0452c7715fc835d1 comic32.exe
4e412c772294403ab62fb2d247d85c60 courie32.exe
4d90016026e2da447593b41a8d8fa8bd georgi32.exe

21
x11-fonts-corefonts/Pkgfile → xorg-font-msttcorefonts/Pkgfile
View File

@ -1,11 +1,12 @@
# URL: http://corefonts.sourceforge.net/
# Description: Microsoft's Web Fonts (truetype)
# Maintainer: Matt Housh, jaeger at morpheus dot net
# Depends on: xorg-mkfontdir, xorg-mkfontscale
name=x11-fonts-corefonts
version=2.0
name=xorg-font-msttcorefonts
version=1.3
release=1
source=(http://www.kyz.uklinux.net/downloads/cabextract-1.1.tar.gz \
source=(http://www.cabextract.org.uk/cabextract-1.2.tar.gz \
http://dl.sourceforge.net/sourceforge/corefonts/andale32.exe \
http://dl.sourceforge.net/sourceforge/corefonts/arial32.exe \
http://dl.sourceforge.net/sourceforge/corefonts/arialb32.exe \
@ -16,17 +17,17 @@ source=(http://www.kyz.uklinux.net/downloads/cabextract-1.1.tar.gz \
http://dl.sourceforge.net/sourceforge/corefonts/times32.exe \
http://dl.sourceforge.net/sourceforge/corefonts/trebuc32.exe \
http://dl.sourceforge.net/sourceforge/corefonts/verdan32.exe \
http://dl.sourceforge.net/sourceforge/corefonts/webdin32.exe \
http://dl.sourceforge.net/sourceforge/corefonts/wd97vwr32.exe)
http://dl.sourceforge.net/sourceforge/corefonts/wd97vwr32.exe \
http://dl.sourceforge.net/sourceforge/corefonts/webdin32.exe)
build() {
(cd cabextract-1.1 && ./configure && make)
(cd cabextract-1.2 && ./configure && make)
for font in *.exe
do
cabextract-1.1/cabextract --lowercase $font
cabextract-1.2/cabextract --lowercase $font
done
cabextract-1.1/cabextract --lowercase viewer1.cab
mkdir -p $PKG/usr/share/fonts/corefonts
cabextract-1.2/cabextract --lowercase viewer1.cab
mkdir -p $PKG/usr/lib/X11/fonts/msttcorefonts
install -o root -g root -m 0644 *.ttf \
$PKG/usr/share/fonts/corefonts/
$PKG/usr/lib/X11/fonts/msttcorefonts/
}

4
xorg-font-msttcorefonts/post-install Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
mkfontdir /usr/lib/X11/fonts/msttcorefonts
mkfontscale /usr/lib/X11/fonts/msttcorefonts

3
xpdf/.md5sum
View File

@ -1,2 +1,3 @@
877118786dfe27d1b7aa5a6759cc6e45 xpdf-3.02.patch
599dc4cc65a07ee868cf92a667a913d2 xpdf-3.02.tar.gz
877118786dfe27d1b7aa5a6759cc6e45 xpdf-3.02pl1.patch
3a5cb165ae66781e0b21e6219ae06795 xpdf-3.02pl2.patch

8
xpdf/Pkgfile
View File

@ -6,13 +6,15 @@
name=xpdf
version=3.02
release=2
release=3
source=(ftp://ftp.foolabs.com/pub/xpdf/$name-$version.tar.gz
$name-$version.patch)
$name-${version}pl1.patch
$name-${version}pl2.patch)
build() {
cd $name-$version
patch -p1 -i $SRC/$name-$version.patch
patch -p1 -i $SRC/$name-${version}pl1.patch
patch -p1 -i $SRC/$name-${version}pl2.patch
./configure \
--prefix=/usr \
--with-Xm-library=/usr/lib \

0
xpdf/xpdf-3.02.patch → xpdf/xpdf-3.02pl1.patch
View File

823
xpdf/xpdf-3.02pl2.patch Normal file
View File

@ -0,0 +1,823 @@
diff -c -r xpdf-3.02pl1.orig/xpdf/Stream.cc xpdf-3.02/xpdf/Stream.cc
*** xpdf-3.02pl1.orig/xpdf/Stream.cc Thu Oct 25 15:47:38 2007
--- xpdf-3.02/xpdf/Stream.cc Thu Oct 25 15:48:19 2007
***************
*** 1243,1265 ****
columns = columnsA;
if (columns < 1) {
columns = 1;
! }
! if (columns + 4 <= 0) {
! columns = INT_MAX - 4;
}
rows = rowsA;
endOfBlock = endOfBlockA;
black = blackA;
! refLine = (short *)gmallocn(columns + 3, sizeof(short));
! codingLine = (short *)gmallocn(columns + 2, sizeof(short));
eof = gFalse;
row = 0;
nextLine2D = encoding < 0;
inputBits = 0;
! codingLine[0] = 0;
! codingLine[1] = refLine[2] = columns;
! a0 = 1;
buf = EOF;
}
--- 1243,1268 ----
columns = columnsA;
if (columns < 1) {
columns = 1;
! } else if (columns > INT_MAX - 2) {
! columns = INT_MAX - 2;
}
rows = rowsA;
endOfBlock = endOfBlockA;
black = blackA;
! // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = columns
! // ---> max codingLine size = columns + 1
! // refLine has one extra guard entry at the end
! // ---> max refLine size = columns + 2
! codingLine = (int *)gmallocn(columns + 1, sizeof(int));
! refLine = (int *)gmallocn(columns + 2, sizeof(int));
eof = gFalse;
row = 0;
nextLine2D = encoding < 0;
inputBits = 0;
! codingLine[0] = columns;
! a0i = 0;
! outputBits = 0;
buf = EOF;
}
***************
*** 1278,1286 ****
row = 0;
nextLine2D = encoding < 0;
inputBits = 0;
! codingLine[0] = 0;
! codingLine[1] = columns;
! a0 = 1;
buf = EOF;
// skip any initial zero bits and end-of-line marker, and get the 2D
--- 1281,1289 ----
row = 0;
nextLine2D = encoding < 0;
inputBits = 0;
! codingLine[0] = columns;
! a0i = 0;
! outputBits = 0;
buf = EOF;
// skip any initial zero bits and end-of-line marker, and get the 2D
***************
*** 1297,1507 ****
}
}
int CCITTFaxStream::lookChar() {
short code1, code2, code3;
! int a0New;
! GBool err, gotEOL;
! int ret;
! int bits, i;
! // if at eof just return EOF
! if (eof && codingLine[a0] >= columns) {
! return EOF;
}
// read the next row
! err = gFalse;
! if (codingLine[a0] >= columns) {
// 2-D encoding
if (nextLine2D) {
- // state:
- // a0New = current position in coding line (0 <= a0New <= columns)
- // codingLine[a0] = last change in coding line
- // (black-to-white if a0 is even,
- // white-to-black if a0 is odd)
- // refLine[b1] = next change in reference line of opposite color
- // to a0
- // invariants:
- // 0 <= codingLine[a0] <= a0New
- // <= refLine[b1] <= refLine[b1+1] <= columns
- // 0 <= a0 <= columns+1
- // refLine[0] = 0
- // refLine[n] = refLine[n+1] = columns
- // -- for some 1 <= n <= columns+1
- // end condition:
- // 0 = codingLine[0] <= codingLine[1] < codingLine[2] < ...
- // < codingLine[n-1] < codingLine[n] = columns
- // -- where 1 <= n <= columns+1
for (i = 0; codingLine[i] < columns; ++i) {
refLine[i] = codingLine[i];
}
! refLine[i] = refLine[i + 1] = columns;
! b1 = 1;
! a0New = codingLine[a0 = 0] = 0;
! do {
code1 = getTwoDimCode();
switch (code1) {
case twoDimPass:
! if (refLine[b1] < columns) {
! a0New = refLine[b1 + 1];
! b1 += 2;
}
break;
case twoDimHoriz:
! if ((a0 & 1) == 0) {
! code1 = code2 = 0;
do {
! code1 += code3 = getWhiteCode();
} while (code3 >= 64);
do {
! code2 += code3 = getBlackCode();
} while (code3 >= 64);
} else {
- code1 = code2 = 0;
do {
! code1 += code3 = getBlackCode();
} while (code3 >= 64);
do {
! code2 += code3 = getWhiteCode();
} while (code3 >= 64);
}
! if (code1 > 0 || code2 > 0) {
! if (a0New + code1 <= columns) {
! codingLine[a0 + 1] = a0New + code1;
! } else {
! codingLine[a0 + 1] = columns;
! }
! ++a0;
! if (codingLine[a0] + code2 <= columns) {
! codingLine[a0 + 1] = codingLine[a0] + code2;
! } else {
! codingLine[a0 + 1] = columns;
! }
! ++a0;
! a0New = codingLine[a0];
! while (refLine[b1] <= a0New && refLine[b1] < columns) {
! b1 += 2;
}
}
break;
! case twoDimVert0:
! if (refLine[b1] < columns) {
! a0New = codingLine[++a0] = refLine[b1];
! ++b1;
! while (refLine[b1] <= a0New && refLine[b1] < columns) {
! b1 += 2;
}
- } else {
- a0New = codingLine[++a0] = columns;
}
break;
case twoDimVertR1:
! if (refLine[b1] + 1 < columns) {
! a0New = codingLine[++a0] = refLine[b1] + 1;
! ++b1;
! while (refLine[b1] <= a0New && refLine[b1] < columns) {
! b1 += 2;
}
- } else {
- a0New = codingLine[++a0] = columns;
}
break;
! case twoDimVertL1:
! if (refLine[b1] - 1 > a0New || (a0 == 0 && refLine[b1] == 1)) {
! a0New = codingLine[++a0] = refLine[b1] - 1;
! --b1;
! while (refLine[b1] <= a0New && refLine[b1] < columns) {
! b1 += 2;
}
}
break;
! case twoDimVertR2:
! if (refLine[b1] + 2 < columns) {
! a0New = codingLine[++a0] = refLine[b1] + 2;
! ++b1;
! while (refLine[b1] <= a0New && refLine[b1] < columns) {
! b1 += 2;
}
- } else {
- a0New = codingLine[++a0] = columns;
}
break;
case twoDimVertL2:
! if (refLine[b1] - 2 > a0New || (a0 == 0 && refLine[b1] == 2)) {
! a0New = codingLine[++a0] = refLine[b1] - 2;
! --b1;
! while (refLine[b1] <= a0New && refLine[b1] < columns) {
! b1 += 2;
}
! }
! break;
! case twoDimVertR3:
! if (refLine[b1] + 3 < columns) {
! a0New = codingLine[++a0] = refLine[b1] + 3;
! ++b1;
! while (refLine[b1] <= a0New && refLine[b1] < columns) {
! b1 += 2;
}
- } else {
- a0New = codingLine[++a0] = columns;
}
break;
! case twoDimVertL3:
! if (refLine[b1] - 3 > a0New || (a0 == 0 && refLine[b1] == 3)) {
! a0New = codingLine[++a0] = refLine[b1] - 3;
! --b1;
! while (refLine[b1] <= a0New && refLine[b1] < columns) {
! b1 += 2;
}
}
break;
case EOF:
eof = gTrue;
! codingLine[a0 = 0] = columns;
! return EOF;
default:
error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
err = gTrue;
break;
}
! } while (codingLine[a0] < columns);
// 1-D encoding
} else {
! codingLine[a0 = 0] = 0;
! while (1) {
code1 = 0;
! do {
! code1 += code3 = getWhiteCode();
! } while (code3 >= 64);
! codingLine[a0+1] = codingLine[a0] + code1;
! ++a0;
! if (codingLine[a0] >= columns) {
! break;
! }
! code2 = 0;
! do {
! code2 += code3 = getBlackCode();
! } while (code3 >= 64);
! codingLine[a0+1] = codingLine[a0] + code2;
! ++a0;
! if (codingLine[a0] >= columns) {
! break;
}
}
}
- if (codingLine[a0] != columns) {
- error(getPos(), "CCITTFax row is wrong length (%d)", codingLine[a0]);
- // force the row to be the correct length
- while (codingLine[a0] > columns) {
- --a0;
- }
- codingLine[++a0] = columns;
- err = gTrue;
- }
-
// byte-align the row
if (byteAlign) {
inputBits &= ~7;
--- 1300,1529 ----
}
}
+ inline void CCITTFaxStream::addPixels(int a1, int blackPixels) {
+ if (a1 > codingLine[a0i]) {
+ if (a1 > columns) {
+ error(getPos(), "CCITTFax row is wrong length (%d)", a1);
+ err = gTrue;
+ a1 = columns;
+ }
+ if ((a0i & 1) ^ blackPixels) {
+ ++a0i;
+ }
+ codingLine[a0i] = a1;
+ }
+ }
+
+ inline void CCITTFaxStream::addPixelsNeg(int a1, int blackPixels) {
+ if (a1 > codingLine[a0i]) {
+ if (a1 > columns) {
+ error(getPos(), "CCITTFax row is wrong length (%d)", a1);
+ err = gTrue;
+ a1 = columns;
+ }
+ if ((a0i & 1) ^ blackPixels) {
+ ++a0i;
+ }
+ codingLine[a0i] = a1;
+ } else if (a1 < codingLine[a0i]) {
+ if (a1 < 0) {
+ error(getPos(), "Invalid CCITTFax code");
+ err = gTrue;
+ a1 = 0;
+ }
+ while (a0i > 0 && a1 <= codingLine[a0i - 1]) {
+ --a0i;
+ }
+ codingLine[a0i] = a1;
+ }
+ }
+
int CCITTFaxStream::lookChar() {
short code1, code2, code3;
! int b1i, blackPixels, i, bits;
! GBool gotEOL;
! if (buf != EOF) {
! return buf;
}
// read the next row
! if (outputBits == 0) {
!
! // if at eof just return EOF
! if (eof) {
! return EOF;
! }
!
! err = gFalse;
// 2-D encoding
if (nextLine2D) {
for (i = 0; codingLine[i] < columns; ++i) {
refLine[i] = codingLine[i];
}
! refLine[i++] = columns;
! refLine[i] = columns;
! codingLine[0] = 0;
! a0i = 0;
! b1i = 0;
! blackPixels = 0;
! // invariant:
! // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1]
! // <= columns
! // exception at left edge:
! // codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible
! // exception at right edge:
! // refLine[b1i] = refLine[b1i+1] = columns is possible
! while (codingLine[a0i] < columns) {
code1 = getTwoDimCode();
switch (code1) {
case twoDimPass:
! addPixels(refLine[b1i + 1], blackPixels);
! if (refLine[b1i + 1] < columns) {
! b1i += 2;
}
break;
case twoDimHoriz:
! code1 = code2 = 0;
! if (blackPixels) {
do {
! code1 += code3 = getBlackCode();
} while (code3 >= 64);
do {
! code2 += code3 = getWhiteCode();
} while (code3 >= 64);
} else {
do {
! code1 += code3 = getWhiteCode();
} while (code3 >= 64);
do {
! code2 += code3 = getBlackCode();
} while (code3 >= 64);
}
! addPixels(codingLine[a0i] + code1, blackPixels);
! if (codingLine[a0i] < columns) {
! addPixels(codingLine[a0i] + code2, blackPixels ^ 1);
! }
! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
! b1i += 2;
! }
! break;
! case twoDimVertR3:
! addPixels(refLine[b1i] + 3, blackPixels);
! blackPixels ^= 1;
! if (codingLine[a0i] < columns) {
! ++b1i;
! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
! b1i += 2;
}
}
break;
! case twoDimVertR2:
! addPixels(refLine[b1i] + 2, blackPixels);
! blackPixels ^= 1;
! if (codingLine[a0i] < columns) {
! ++b1i;
! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
! b1i += 2;
}
}
break;
case twoDimVertR1:
! addPixels(refLine[b1i] + 1, blackPixels);
! blackPixels ^= 1;
! if (codingLine[a0i] < columns) {
! ++b1i;
! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
! b1i += 2;
}
}
break;
! case twoDimVert0:
! addPixels(refLine[b1i], blackPixels);
! blackPixels ^= 1;
! if (codingLine[a0i] < columns) {
! ++b1i;
! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
! b1i += 2;
}
}
break;
! case twoDimVertL3:
! addPixelsNeg(refLine[b1i] - 3, blackPixels);
! blackPixels ^= 1;
! if (codingLine[a0i] < columns) {
! if (b1i > 0) {
! --b1i;
! } else {
! ++b1i;
! }
! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
! b1i += 2;
}
}
break;
case twoDimVertL2:
! addPixelsNeg(refLine[b1i] - 2, blackPixels);
! blackPixels ^= 1;
! if (codingLine[a0i] < columns) {
! if (b1i > 0) {
! --b1i;
! } else {
! ++b1i;
}
! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
! b1i += 2;
}
}
break;
! case twoDimVertL1:
! addPixelsNeg(refLine[b1i] - 1, blackPixels);
! blackPixels ^= 1;
! if (codingLine[a0i] < columns) {
! if (b1i > 0) {
! --b1i;
! } else {
! ++b1i;
! }
! while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
! b1i += 2;
}
}
break;
case EOF:
+ addPixels(columns, 0);
eof = gTrue;
! break;
default:
error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
+ addPixels(columns, 0);
err = gTrue;
break;
}
! }
// 1-D encoding
} else {
! codingLine[0] = 0;
! a0i = 0;
! blackPixels = 0;
! while (codingLine[a0i] < columns) {
code1 = 0;
! if (blackPixels) {
! do {
! code1 += code3 = getBlackCode();
! } while (code3 >= 64);
! } else {
! do {
! code1 += code3 = getWhiteCode();
! } while (code3 >= 64);
}
+ addPixels(codingLine[a0i] + code1, blackPixels);
+ blackPixels ^= 1;
}
}
// byte-align the row
if (byteAlign) {
inputBits &= ~7;
***************
*** 1560,1573 ****
// this if we know the stream contains end-of-line markers because
// the "just plow on" technique tends to work better otherwise
} else if (err && endOfLine) {
! do {
if (code1 == EOF) {
eof = gTrue;
return EOF;
}
eatBits(1);
! code1 = lookBits(13);
! } while ((code1 >> 1) != 0x001);
eatBits(12);
if (encoding > 0) {
eatBits(1);
--- 1582,1598 ----
// this if we know the stream contains end-of-line markers because
// the "just plow on" technique tends to work better otherwise
} else if (err && endOfLine) {
! while (1) {
! code1 = lookBits(13);
if (code1 == EOF) {
eof = gTrue;
return EOF;
}
+ if ((code1 >> 1) == 0x001) {
+ break;
+ }
eatBits(1);
! }
eatBits(12);
if (encoding > 0) {
eatBits(1);
***************
*** 1575,1585 ****
}
}
! a0 = 0;
! outputBits = codingLine[1] - codingLine[0];
! if (outputBits == 0) {
! a0 = 1;
! outputBits = codingLine[2] - codingLine[1];
}
++row;
--- 1600,1610 ----
}
}
! // set up for output
! if (codingLine[0] > 0) {
! outputBits = codingLine[a0i = 0];
! } else {
! outputBits = codingLine[a0i = 1];
}
++row;
***************
*** 1587,1625 ****
// get a byte
if (outputBits >= 8) {
! ret = ((a0 & 1) == 0) ? 0xff : 0x00;
! if ((outputBits -= 8) == 0) {
! ++a0;
! if (codingLine[a0] < columns) {
! outputBits = codingLine[a0 + 1] - codingLine[a0];
! }
}
} else {
bits = 8;
! ret = 0;
do {
if (outputBits > bits) {
! i = bits;
! bits = 0;
! if ((a0 & 1) == 0) {
! ret |= 0xff >> (8 - i);
}
! outputBits -= i;
} else {
! i = outputBits;
! bits -= outputBits;
! if ((a0 & 1) == 0) {
! ret |= (0xff >> (8 - i)) << bits;
}
outputBits = 0;
! ++a0;
! if (codingLine[a0] < columns) {
! outputBits = codingLine[a0 + 1] - codingLine[a0];
}
}
! } while (bits > 0 && codingLine[a0] < columns);
}
- buf = black ? (ret ^ 0xff) : ret;
return buf;
}
--- 1612,1654 ----
// get a byte
if (outputBits >= 8) {
! buf = (a0i & 1) ? 0x00 : 0xff;
! outputBits -= 8;
! if (outputBits == 0 && codingLine[a0i] < columns) {
! ++a0i;
! outputBits = codingLine[a0i] - codingLine[a0i - 1];
}
} else {
bits = 8;
! buf = 0;
do {
if (outputBits > bits) {
! buf <<= bits;
! if (!(a0i & 1)) {
! buf |= 0xff >> (8 - bits);
}
! outputBits -= bits;
! bits = 0;
} else {
! buf <<= outputBits;
! if (!(a0i & 1)) {
! buf |= 0xff >> (8 - outputBits);
}
+ bits -= outputBits;
outputBits = 0;
! if (codingLine[a0i] < columns) {
! ++a0i;
! outputBits = codingLine[a0i] - codingLine[a0i - 1];
! } else if (bits > 0) {
! buf <<= bits;
! bits = 0;
}
}
! } while (bits);
! }
! if (black) {
! buf ^= 0xff;
}
return buf;
}
***************
*** 1661,1666 ****
--- 1690,1698 ----
code = 0; // make gcc happy
if (endOfBlock) {
code = lookBits(12);
+ if (code == EOF) {
+ return 1;
+ }
if ((code >> 5) == 0) {
p = &whiteTab1[code];
} else {
***************
*** 1673,1678 ****
--- 1705,1713 ----
} else {
for (n = 1; n <= 9; ++n) {
code = lookBits(n);
+ if (code == EOF) {
+ return 1;
+ }
if (n < 9) {
code <<= 9 - n;
}
***************
*** 1684,1689 ****
--- 1719,1727 ----
}
for (n = 11; n <= 12; ++n) {
code = lookBits(n);
+ if (code == EOF) {
+ return 1;
+ }
if (n < 12) {
code <<= 12 - n;
}
***************
*** 1709,1717 ****
code = 0; // make gcc happy
if (endOfBlock) {
code = lookBits(13);
if ((code >> 7) == 0) {
p = &blackTab1[code];
! } else if ((code >> 9) == 0) {
p = &blackTab2[(code >> 1) - 64];
} else {
p = &blackTab3[code >> 7];
--- 1747,1758 ----
code = 0; // make gcc happy
if (endOfBlock) {
code = lookBits(13);
+ if (code == EOF) {
+ return 1;
+ }
if ((code >> 7) == 0) {
p = &blackTab1[code];
! } else if ((code >> 9) == 0 && (code >> 7) != 0) {
p = &blackTab2[(code >> 1) - 64];
} else {
p = &blackTab3[code >> 7];
***************
*** 1723,1728 ****
--- 1764,1772 ----
} else {
for (n = 2; n <= 6; ++n) {
code = lookBits(n);
+ if (code == EOF) {
+ return 1;
+ }
if (n < 6) {
code <<= 6 - n;
}
***************
*** 1734,1739 ****
--- 1778,1786 ----
}
for (n = 7; n <= 12; ++n) {
code = lookBits(n);
+ if (code == EOF) {
+ return 1;
+ }
if (n < 12) {
code <<= 12 - n;
}
***************
*** 1747,1752 ****
--- 1794,1802 ----
}
for (n = 10; n <= 13; ++n) {
code = lookBits(n);
+ if (code == EOF) {
+ return 1;
+ }
if (n < 13) {
code <<= 13 - n;
}
***************
*** 1961,1966 ****
--- 2011,2022 ----
// allocate a buffer for the whole image
bufWidth = ((width + mcuWidth - 1) / mcuWidth) * mcuWidth;
bufHeight = ((height + mcuHeight - 1) / mcuHeight) * mcuHeight;
+ if (bufWidth <= 0 || bufHeight <= 0 ||
+ bufWidth > INT_MAX / bufWidth / (int)sizeof(int)) {
+ error(getPos(), "Invalid image size in DCT stream");
+ y = height;
+ return;
+ }
for (i = 0; i < numComps; ++i) {
frameBuf[i] = (int *)gmallocn(bufWidth * bufHeight, sizeof(int));
memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int));
***************
*** 3036,3041 ****
--- 3092,3102 ----
}
scanInfo.firstCoeff = str->getChar();
scanInfo.lastCoeff = str->getChar();
+ if (scanInfo.firstCoeff < 0 || scanInfo.lastCoeff > 63 ||
+ scanInfo.firstCoeff > scanInfo.lastCoeff) {
+ error(getPos(), "Bad DCT coefficient numbers in scan info block");
+ return gFalse;
+ }
c = str->getChar();
scanInfo.ah = (c >> 4) & 0x0f;
scanInfo.al = c & 0x0f;
diff -c -r xpdf-3.02pl1.orig/xpdf/Stream.h xpdf-3.02/xpdf/Stream.h
*** xpdf-3.02pl1.orig/xpdf/Stream.h Tue Feb 27 14:05:52 2007
--- xpdf-3.02/xpdf/Stream.h Thu Oct 25 15:48:15 2007
***************
*** 528,540 ****
int row; // current row
int inputBuf; // input buffer
int inputBits; // number of bits in input buffer
! short *refLine; // reference line changing elements
! int b1; // index into refLine
! short *codingLine; // coding line changing elements
! int a0; // index into codingLine
int outputBits; // remaining ouput bits
int buf; // character buffer
short getTwoDimCode();
short getWhiteCode();
short getBlackCode();
--- 528,542 ----
int row; // current row
int inputBuf; // input buffer
int inputBits; // number of bits in input buffer
! int *codingLine; // coding line changing elements
! int *refLine; // reference line changing elements
! int a0i; // index into codingLine
! GBool err; // error on current line
int outputBits; // remaining ouput bits
int buf; // character buffer
+ void addPixels(int a1, int black);
+ void addPixelsNeg(int a1, int black);
short getTwoDimCode();
short getWhiteCode();
short getBlackCode();