diff options
| author | Andraž 'ruskie' Levstik | 2008-08-29 20:21:36 +0200 |
|---|---|---|
| committer | Andraž 'ruskie' Levstik | 2008-08-29 20:21:36 +0200 |
| commit | 965ee38e98f3af7112736e38329722539964b562 (patch) | |
| tree | 2093a1c99962a65e25ebd3d7e246530820e4dece /display | |
| parent | 153a2159caca0f437e575ab5855a70edacdf8d1e (diff) | |
| parent | 0b681af40bd832d8722e6d45b2f83aeda830ee3c (diff) | |
Merge branch 'master' into devel-xorg-modular
Conflicts:
ChangeLog
audio-soft/qjackctl/HISTORY
display/qingy/DEPENDS
editors/openoffice/HISTORY
editors/vim/HISTORY
gnome2-libs/libxklavier/DEPENDS
gnome2-libs/libxklavier/HISTORY
kde4-apps/dragonplayer/DEPENDS
kde4-apps/dragonplayer/HISTORY
kde4/KDE_DEPENDS
kde4/kdebase4-runtime/DEPENDS
php-pear/php/BUILD
php-pear/php/DEPENDS
php-pear/php4/HISTORY
science/astrolog/DEPENDS
science/astrolog/HISTORY
shell-term-fm/mrxvt/HISTORY
windowmanagers/blackbox/DEPENDS
windowmanagers/blackbox/HISTORY
wm-addons/bbkeys/HISTORY
x11-libs/xfree86-devel/DEPENDS
x11-libs/xfree86-devel/DETAILS
x11-libs/xfree86-devel/HISTORY
x11-libs/xfree86-devel/TRIGGERS
x11-libs/xfree86/CONFLICTS
x11-libs/xfree86/HISTORY
x11-toolkits/fltk2/HISTORY
x11/sunclock/DEPENDS
x11/sunclock/HISTORY
xfce/xfce4-profile/HISTORY
xorg-lib/pixman/CONFLICTS
Diffstat (limited to 'display')
| -rwxr-xr-x | display/qingy/DEPENDS | 16 | ||||
| -rw-r--r-- | display/qingy/HISTORY | 3 | ||||
| -rw-r--r-- | display/svgalib/HISTORY | 4 | ||||
| -rwxr-xr-x | display/svgalib/PRE_BUILD | 5 | ||||
| -rw-r--r-- | display/svgalib/svgalib_helper-2.6.26.diff | 33 |
5 files changed, 59 insertions, 2 deletions
diff --git a/display/qingy/DEPENDS b/display/qingy/DEPENDS index ce20b4d2be..29ef0bbe06 100755 --- a/display/qingy/DEPENDS +++ b/display/qingy/DEPENDS @@ -4,13 +4,27 @@ elif [[ "QINGY_CRYPTO" == 'libgcrypt' ]]; then depends libgcrypt fi && -depends directfb && +depends directfb && +# according to configure it _should_ be optional, but isn't +# contacting the author about it... +#optional_depends directfb +# '--enable-directFB-support' \ +# '--disable-directFB-support' \ +# 'For DirectFB graphics' && optional_depends xorg-server \ '' \ '' \ 'For X sessions' && + +source $GRIMOIRE/FUNCTIONS && +if check_if_xorg_modular_server +then + depends libxscrnsaver +fi && + + optional_depends gpm \ '--enable-gpm-lock' \ '--disable-gpm-lock' \ diff --git a/display/qingy/HISTORY b/display/qingy/HISTORY index ee7c4a2e39..979b4dc337 100644 --- a/display/qingy/HISTORY +++ b/display/qingy/HISTORY @@ -1,3 +1,6 @@ +2008-08-21 Thomas Orgis <sobukus@sourcemage.org> + * DEPENDS: fix for xorg-modular, add option to disable x support at all + 2008-07-13 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Updated to 0.9.7 diff --git a/display/svgalib/HISTORY b/display/svgalib/HISTORY index 5c72579cb4..f9159d2f5c 100644 --- a/display/svgalib/HISTORY +++ b/display/svgalib/HISTORY @@ -1,3 +1,7 @@ +2008-08-10 Robin Cook <rcook@wyrms.net> + * PRE_BUILD: updated to apply patch for 2.6.26 + http://bugs.gentoo.org/attachment.cgi?id=161385&action=view + 2007-11-10 Robin Cook <rcook@wyrms.net> * PRE_BUILD: added to apply patch for 2.6.23 http://groups.google.com/group/svgalib/browse_thread/thread/367b73b209a0bb77 diff --git a/display/svgalib/PRE_BUILD b/display/svgalib/PRE_BUILD index 8f3b0f93e4..e8827616a5 100755 --- a/display/svgalib/PRE_BUILD +++ b/display/svgalib/PRE_BUILD @@ -10,7 +10,10 @@ sedit "s:\$(shell uname -r):$KER:g" \ # Apply patchs for kernel versions 2.6.15* and newer KER=${KER:0:6} && -if [ ${KER//\./} > 2623 ]; then +if [ ${KER//\./} > 2626 ]; then + patch -p1 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.26.diff + patch -p1 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.23.diff +elif [ ${KER//\./} > 2623 ]; then patch -p1 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.23.diff elif [ ${KER//\./} > 2619 ]; then patch -p0 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.19.diff diff --git a/display/svgalib/svgalib_helper-2.6.26.diff b/display/svgalib/svgalib_helper-2.6.26.diff new file mode 100644 index 0000000000..2fa11295df --- /dev/null +++ b/display/svgalib/svgalib_helper-2.6.26.diff @@ -0,0 +1,33 @@ +--- svgalib-1.9.25/kernel/svgalib_helper/kernel26compat.h ++++ svgalib-1.9.25/kernel/svgalib_helper/kernel26compat.h +@@ -105,7 +109,8 @@ + class_device_create(svgalib_helper_class, \ + MKDEV(SVGALIB_HELPER_MAJOR, _minor), \ + &sh_pci_devs[_minor]->dev->dev, _name); +-#else /* 2.6.15 changed class_device_create */ ++/* 2.6.15 changed class_device_create */ ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) + # define SLH_SYSFS_ADD_CONTROL \ + class_device_create(svgalib_helper_class, NULL, \ + MKDEV(SVGALIB_HELPER_MAJOR, 0), \ +@@ -115,7 +120,18 @@ + class_device_create(svgalib_helper_class, NULL, \ + MKDEV(SVGALIB_HELPER_MAJOR, _minor), \ + &sh_pci_devs[_minor]->dev->dev, _name); +-#endif /* 2.6.15 */ ++/* 2.6.26 changed class_device_create to device_create */ ++#else ++# define SLH_SYSFS_ADD_CONTROL \ ++ device_create(svgalib_helper_class, NULL, \ ++ MKDEV(SVGALIB_HELPER_MAJOR, 0), \ ++ NULL, "svga"); ++ ++# define SLH_SYSFS_ADD_DEVICE(_name, _minor) \ ++ device_create(svgalib_helper_class, NULL, \ ++ MKDEV(SVGALIB_HELPER_MAJOR, _minor), \ ++ &sh_pci_devs[_minor]->dev->dev, _name); ++#endif + + # define SLH_SYSFS_REMOVE_DEVICE(i) \ + class_destroy(svgalib_helper_class); + |