diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..002df17 --- /dev/null +++ b/README.rst @@ -0,0 +1,7 @@ +gryf_overlay +============ + +There is a bunch of ebuilds, which I'd like to keep - some of them are taken +from other overlays, some are tweaked ones from official repositories while the +other are written from scratch by me. There is no guarantee, that anything from +this overlay will work. You have been warned :) diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest deleted file mode 100644 index 20fde5f..0000000 --- a/app-misc/mc/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX baudrate.patch 497 RMD160 57c1bd9bd81fcf40b567a6f315fb3835d8491ab2 SHA1 1ad211f2f2d77dc60c1e9be556dca77ec7190602 SHA256 c1aab90b413a7458c04cf4f8b9c9974135d7c9989321b46267eba855c632cfb6 -DIST mc-4.7.5.3.tar.lzma 1965523 RMD160 a0fae65f5fbe0e80cd663c10e2f41065e3863750 SHA1 e1211180704831a3c78f7ec1f46073765924a061 SHA256 5675824d0662144a929215ddda3f627c7b58a91c48759285f63a6bbf6ed55957 -EBUILD mc-4.7.5.3-r10.ebuild 2004 RMD160 40e13303545d3f69ab9e4961a79527ed854c2f5f SHA1 a400fe16fb6977f064e2886c0b9b4143a52cc877 SHA256 59370c40eeed1d9460bacd3938454e57fb088096041021f6bf014ec018f1e3a7 diff --git a/app-misc/mc/files/baudrate.patch b/app-misc/mc/files/baudrate.patch deleted file mode 100644 index 3d977c0..0000000 --- a/app-misc/mc/files/baudrate.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur mc-4.7.5.3_orig/src/filemanager/midnight.c mc-4.7.5.3/src/filemanager/midnight.c ---- mc-4.7.5.3_orig/src/filemanager/midnight.c 2011-07-26 14:55:53.000000000 +0200 -+++ mc-4.7.5.3/src/filemanager/midnight.c 2011-08-02 20:58:08.000000000 +0200 -@@ -797,7 +797,7 @@ - - tty_setup_sigwinch (sigwinch_handler); - -- if ((tty_baudrate () < 9600) || tty_is_slow ()) -+ if ((tty_baudrate() > 0 && tty_baudrate() < 9600) || tty_is_slow()) - verbose = 0; - - init_xterm_support (); diff --git a/app-misc/mc/mc-4.7.5.3-r10.ebuild b/app-misc/mc/mc-4.7.5.3-r10.ebuild deleted file mode 100644 index 5a25e40..0000000 --- a/app-misc/mc/mc-4.7.5.3-r10.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.5.3.ebuild,v 1.1 2011/07/30 17:01:51 slyfox Exp $ - -EAPI=4 - -inherit eutils base - -MY_P=${P/_/-} - -DESCRIPTION="GNU Midnight Commander is a text based file manager" -HOMEPAGE="http://www.midnight-commander.org" -SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.lzma" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" -IUSE="+edit gpm +ncurses nls samba slang X" - -REQUIRED_USE="^^ ( ncurses slang )" - -RDEPEND=">=dev-libs/glib-2.8:2 - gpm? ( sys-libs/gpm ) - kernel_linux? ( sys-fs/e2fsprogs ) - ncurses? ( sys-libs/ncurses ) - samba? ( net-fs/samba ) - slang? ( >=sys-libs/slang-2 ) - X? ( x11-libs/libX11 - x11-libs/libICE - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libSM )" -DEPEND="${RDEPEND} - app-arch/xz-utils - dev-util/pkgconfig - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}/baudrate.patch" -} -src_configure() { - local myscreen=ncurses - use slang && myscreen=slang - - econf \ - --disable-dependency-tracking \ - $(use_enable nls) \ - --enable-vfs \ - $(use_enable kernel_linux vfs-undelfs) \ - --enable-charset \ - $(use_with X x) \ - $(use_enable samba vfs-smb) \ - $(use_with gpm gpm-mouse) \ - --with-screen=${myscreen} \ - $(use_with edit) -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS README - - # fix bug #334383 - if [[ ${EUID} == 0 ]] ; then - fowners root:tty /usr/libexec/mc/cons.saver || - die "setting cons.saver's owner failed" - fperms g+s /usr/libexec/mc/cons.saver || - die "setting cons.saver's permissions failed" - fi -} - -pkg_postinst() { - elog "To enable exiting to latest working directory," - elog "put this into your ~/.bashrc:" - elog ". ${EPREFIX}/usr/libexec/mc/mc.sh" -} diff --git a/app-vim/pyclewn/Manifest b/app-vim/pyclewn/Manifest deleted file mode 100644 index a75b2c3..0000000 --- a/app-vim/pyclewn/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX pyclewn_install-access-denied.patch 441 RMD160 f56834f1948c496bc8ad112a94771314e48938fe SHA1 1c303794db5e9cb984454111eaeb3255d3dacc7f SHA256 f30b84374a7237f6663eff84a6d3263872fb4e3afd2d64d2383361e864677ea6 -AUX pyclewn_install.py 5572 RMD160 f0de3312be5d7130fcbd77f9b3b3d240b844853c SHA1 9b450ea797e636c8e938c674afc891d05f199ed6 SHA256 f46ed19e6471d0c90ad1acef9b17cd0d38bc5950fb3a5016426e22cf659e9f5c -AUX pyclewn_install.py.new 5428 RMD160 2ba3c34706b722554a6caa558334e5aef34a1524 SHA1 f3530dde3a4ccaadd96a4993135aa7c1b6a50fd1 SHA256 9541dbe4098e4e85ff9bba69aa417906719929912df4d84dd0f0fe985c25db91 -DIST pyclewn-1.7.py2.tar.gz 139408 RMD160 883cfc4505b658f6aaa07828d31650d0a7df35ce SHA1 b19be2a7929c4849879f61d12e1c42bb327d0254 SHA256 5c9abf4c7995ede2e7fa60b39d9d368c2dd3153b4ab1bcdd157e40b77d744317 -EBUILD pyclewn-1.7.ebuild 819 RMD160 6bcc8a8846631b7394c7dcf3ba33bf5330089875 SHA1 c56731a7f2fb422ade284a4d080eaff1bda31dd5 SHA256 c6b3e7cd3d1c70b1af27e001eceb9c1f6e846e6c2ef389f8aea3a422ec41f294 diff --git a/app-vim/pyclewn/files/pyclewn_install-access-denied.patch b/app-vim/pyclewn/files/pyclewn_install-access-denied.patch deleted file mode 100644 index e7f1569..0000000 --- a/app-vim/pyclewn/files/pyclewn_install-access-denied.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pyclewn_install.py 2011-11-23 21:14:52.000000000 +0100 -+++ pyclewn_install.py.new 2011-11-23 21:19:31.000000000 +0100 -@@ -59,8 +59,6 @@ - def build_vimhelp(): - """Add pyclewn help to Vim help.""" - helpdir = pathjoin(vimdir(), 'doc') -- print >> sys.stderr, 'running Vim help tags file generation in %s' % helpdir -- vim.exec_vimcmd(['helptags ' + helpdir, 'echo v:version']) - - def unlink(filename): - """Delete a file.""" diff --git a/app-vim/pyclewn/files/pyclewn_install.py b/app-vim/pyclewn/files/pyclewn_install.py deleted file mode 100755 index 8e37ada..0000000 --- a/app-vim/pyclewn/files/pyclewn_install.py +++ /dev/null @@ -1,169 +0,0 @@ -#!/usr/bin/env python -"""Windows install scripts. -""" - -import sys -import os -import os.path -import string -import distutils.sysconfig as sysconfig -import distutils.dir_util as dir_util -from os.path import join as pathjoin -from distutils.file_util import copy_file -from distutils.errors import DistutilsExecError - -import clewn.vim as vim -import clewn.misc as misc - -ICON_NAME = 'clewn.ico' -PYCLEWN_SHORTCUT = 'Pyclewn.lnk' - -def icon(vimdir): - """Return icon file tuple to be used as data file in distutils setup.""" - return (vimdir, [pathjoin('images', ICON_NAME)]) - -def vim_features(): - """Abort if missing required Vim feature.""" - output = vim.exec_vimcmd(['version']) - - print >> sys.stderr, 'checking netbeans support in vim:', - try: - output.index('+netbeans_intg') - except ValueError: - raise DistutilsExecError, 'netbeans support in vim is required' - print >> sys.stderr, 'yes' - - print >> sys.stderr, 'checking auto commands support in vim:', - try: - output.index('+autocmd') - except ValueError: - raise DistutilsExecError, 'auto commands support in vim is required' - print >> sys.stderr, 'yes' - -@misc.previous_evaluation -def vimdir(): - """Return the vim runtime files directory.""" - if 'vimdir' in os.environ: - dir = os.environ['vimdir'] - else: - path = vim.exec_vimcmd(['echon $VIM']) - path = path.strip(' \t\r\n') - if not os.path.isdir(path): - nodir = ('Invalid data files path. $VIM="%s" is returned' - ' by Vim, but this is not an existing directory.' % path) - raise DistutilsExecError, nodir - dir = pathjoin(path, 'vimfiles') - print 'Vim user data files location: "%s"' % dir - return dir - -def build_vimhelp(): - """Add pyclewn help to Vim help.""" - helpdir = pathjoin(vimdir(), 'doc') - print >> sys.stderr, 'running Vim help tags file generation in %s' % helpdir - vim.exec_vimcmd(['helptags ' + helpdir, 'echo v:version']) - -def unlink(filename): - """Delete a file.""" - try: - os.unlink(filename) - except OSError: - pass - -def substitute_autoload(runtime_dir, mapping): - """Substitute templates in the autoload plugin.""" - plugin = pathjoin(pathjoin(runtime_dir, 'autoload'), 'pyclewn.vim') - f = open(plugin) - content = f.read() - f.close() - content = string.Template(content).substitute(mapping) - f = open(plugin, 'w') - f.write(content) - f.close() - -def install(): - """Write the bat file and copy the runtime files.""" - prefix = sysconfig.get_config_var('prefix') - scripts = pathjoin(prefix, 'scripts') - vim_features() - - # install runtime files - runtime_dir = pathjoin(prefix, 'pyclewn') - icon_file = pathjoin(runtime_dir, ICON_NAME) - copy_file(icon_file, scripts) - print >> sys.stderr, 'copying file %s' % icon_file - unlink(icon_file) - - # substitute templates in the autoload plugin - clewnbat = pathjoin(scripts, 'pyclewn.bat') - mapping = {'pgm': misc.quote(clewnbat), 'start': 'start '} - substitute_autoload(runtime_dir, mapping) - - for filename in dir_util.copy_tree(runtime_dir, vimdir()): - print >> sys.stderr, 'copying file %s' % filename - print >> sys.stderr, 'removing directory %s' % runtime_dir - dir_util.remove_tree(runtime_dir) - - build_vimhelp() - - # create pyclewn.bat - pyexe = pathjoin(prefix, 'python.exe') - scriptpy = pathjoin(scripts, 'pyclewn') - f = open(clewnbat, 'w') - f.write("@start %s %s %%*\n" % (pyexe, scriptpy)) - f.close() - - # create Windows shortcut - create_shortcut( - clewnbat, - 'Pyclewn allows using Vim as a front end to a debugger.', - PYCLEWN_SHORTCUT, - r'--pgm=C:\mingw\bin\gdb.exe --daemon', - '', - pathjoin(scripts, ICON_NAME), - 0) - - # copy shortcut to Desktop when it does not exist - desktop_path = get_special_folder_path('CSIDL_DESKTOPDIRECTORY') - pyclewn_shortcut = pathjoin(desktop_path, PYCLEWN_SHORTCUT) - if not os.path.exists(pyclewn_shortcut): - copy_file(PYCLEWN_SHORTCUT, desktop_path) - print >> sys.stderr, 'copying pyclewn to the desktop: %s' % pyclewn_shortcut - - # cleanup - unlink(PYCLEWN_SHORTCUT) - unlink(pathjoin(scripts, 'pyclewn_install.py')) - unlink(pathjoin(scripts, 'pyclewn_install.pyc')) - unlink(pathjoin(scripts, 'pyclewn_install.pyo')) - - print >> sys.stderr, 'pyclewn postinstall completed' - -def uninstall(): - """Uninstall on Windows.""" - prefix = sysconfig.get_config_var('prefix') - scripts = pathjoin(prefix, 'scripts') - - # remove scripts, icon and shortcut - unlink(pathjoin(scripts, 'pyclewn')) - unlink(pathjoin(scripts, 'pyclewn.bat')) - unlink(pathjoin(scripts, ICON_NAME)) - unlink(pathjoin(scripts, 'pyclewn_install.py')) - desktop_path = get_special_folder_path('CSIDL_DESKTOPDIRECTORY') - unlink(pathjoin(desktop_path, PYCLEWN_SHORTCUT)) - - # remove vim files and rebuild vim help - unlink(pathjoin(pathjoin(vimdir(), 'doc'), 'pyclewn.txt')) - unlink(pathjoin(pathjoin(vimdir(), 'syntax'), 'dbgvar.vim')) - unlink(pathjoin(pathjoin(vimdir(), 'plugin'), 'pyclewn.vim')) - unlink(pathjoin(pathjoin(vimdir(), 'autoload'), 'pyclewn.vim')) - build_vimhelp() - -if __name__ == '__main__': - if os.name == 'nt': - try: - if sys.argv[1] == '-install': - install() - elif sys.argv[1] == '-remove': - uninstall() - except Exception, err: - # let the python installer print the error - print >> sys.stderr, err diff --git a/app-vim/pyclewn/files/pyclewn_install.py.new b/app-vim/pyclewn/files/pyclewn_install.py.new deleted file mode 100755 index 7aa70a8..0000000 --- a/app-vim/pyclewn/files/pyclewn_install.py.new +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/env python -"""Windows install scripts. -""" - -import sys -import os -import os.path -import string -import distutils.sysconfig as sysconfig -import distutils.dir_util as dir_util -from os.path import join as pathjoin -from distutils.file_util import copy_file -from distutils.errors import DistutilsExecError - -import clewn.vim as vim -import clewn.misc as misc - -ICON_NAME = 'clewn.ico' -PYCLEWN_SHORTCUT = 'Pyclewn.lnk' - -def icon(vimdir): - """Return icon file tuple to be used as data file in distutils setup.""" - return (vimdir, [pathjoin('images', ICON_NAME)]) - -def vim_features(): - """Abort if missing required Vim feature.""" - output = vim.exec_vimcmd(['version']) - - print >> sys.stderr, 'checking netbeans support in vim:', - try: - output.index('+netbeans_intg') - except ValueError: - raise DistutilsExecError, 'netbeans support in vim is required' - print >> sys.stderr, 'yes' - - print >> sys.stderr, 'checking auto commands support in vim:', - try: - output.index('+autocmd') - except ValueError: - raise DistutilsExecError, 'auto commands support in vim is required' - print >> sys.stderr, 'yes' - -@misc.previous_evaluation -def vimdir(): - """Return the vim runtime files directory.""" - if 'vimdir' in os.environ: - dir = os.environ['vimdir'] - else: - path = vim.exec_vimcmd(['echon $VIM']) - path = path.strip(' \t\r\n') - if not os.path.isdir(path): - nodir = ('Invalid data files path. $VIM="%s" is returned' - ' by Vim, but this is not an existing directory.' % path) - raise DistutilsExecError, nodir - dir = pathjoin(path, 'vimfiles') - print 'Vim user data files location: "%s"' % dir - return dir - -def build_vimhelp(): - """Add pyclewn help to Vim help.""" - helpdir = pathjoin(vimdir(), 'doc') - -def unlink(filename): - """Delete a file.""" - try: - os.unlink(filename) - except OSError: - pass - -def substitute_autoload(runtime_dir, mapping): - """Substitute templates in the autoload plugin.""" - plugin = pathjoin(pathjoin(runtime_dir, 'autoload'), 'pyclewn.vim') - f = open(plugin) - content = f.read() - f.close() - content = string.Template(content).substitute(mapping) - f = open(plugin, 'w') - f.write(content) - f.close() - -def install(): - """Write the bat file and copy the runtime files.""" - prefix = sysconfig.get_config_var('prefix') - scripts = pathjoin(prefix, 'scripts') - vim_features() - - # install runtime files - runtime_dir = pathjoin(prefix, 'pyclewn') - icon_file = pathjoin(runtime_dir, ICON_NAME) - copy_file(icon_file, scripts) - print >> sys.stderr, 'copying file %s' % icon_file - unlink(icon_file) - - # substitute templates in the autoload plugin - clewnbat = pathjoin(scripts, 'pyclewn.bat') - mapping = {'pgm': misc.quote(clewnbat), 'start': 'start '} - substitute_autoload(runtime_dir, mapping) - - for filename in dir_util.copy_tree(runtime_dir, vimdir()): - print >> sys.stderr, 'copying file %s' % filename - print >> sys.stderr, 'removing directory %s' % runtime_dir - dir_util.remove_tree(runtime_dir) - - build_vimhelp() - - # create pyclewn.bat - pyexe = pathjoin(prefix, 'python.exe') - scriptpy = pathjoin(scripts, 'pyclewn') - f = open(clewnbat, 'w') - f.write("@start %s %s %%*\n" % (pyexe, scriptpy)) - f.close() - - # create Windows shortcut - create_shortcut( - clewnbat, - 'Pyclewn allows using Vim as a front end to a debugger.', - PYCLEWN_SHORTCUT, - r'--pgm=C:\mingw\bin\gdb.exe --daemon', - '', - pathjoin(scripts, ICON_NAME), - 0) - - # copy shortcut to Desktop when it does not exist - desktop_path = get_special_folder_path('CSIDL_DESKTOPDIRECTORY') - pyclewn_shortcut = pathjoin(desktop_path, PYCLEWN_SHORTCUT) - if not os.path.exists(pyclewn_shortcut): - copy_file(PYCLEWN_SHORTCUT, desktop_path) - print >> sys.stderr, 'copying pyclewn to the desktop: %s' % pyclewn_shortcut - - # cleanup - unlink(PYCLEWN_SHORTCUT) - unlink(pathjoin(scripts, 'pyclewn_install.py')) - unlink(pathjoin(scripts, 'pyclewn_install.pyc')) - unlink(pathjoin(scripts, 'pyclewn_install.pyo')) - - print >> sys.stderr, 'pyclewn postinstall completed' - -def uninstall(): - """Uninstall on Windows.""" - prefix = sysconfig.get_config_var('prefix') - scripts = pathjoin(prefix, 'scripts') - - # remove scripts, icon and shortcut - unlink(pathjoin(scripts, 'pyclewn')) - unlink(pathjoin(scripts, 'pyclewn.bat')) - unlink(pathjoin(scripts, ICON_NAME)) - unlink(pathjoin(scripts, 'pyclewn_install.py')) - desktop_path = get_special_folder_path('CSIDL_DESKTOPDIRECTORY') - unlink(pathjoin(desktop_path, PYCLEWN_SHORTCUT)) - - # remove vim files and rebuild vim help - unlink(pathjoin(pathjoin(vimdir(), 'doc'), 'pyclewn.txt')) - unlink(pathjoin(pathjoin(vimdir(), 'syntax'), 'dbgvar.vim')) - unlink(pathjoin(pathjoin(vimdir(), 'plugin'), 'pyclewn.vim')) - unlink(pathjoin(pathjoin(vimdir(), 'autoload'), 'pyclewn.vim')) - build_vimhelp() - -if __name__ == '__main__': - if os.name == 'nt': - try: - if sys.argv[1] == '-install': - install() - elif sys.argv[1] == '-remove': - uninstall() - except Exception, err: - # let the python installer print the error - print >> sys.stderr, err diff --git a/app-vim/pyclewn/pyclewn-1.7.ebuild b/app-vim/pyclewn/pyclewn-1.7.ebuild deleted file mode 100644 index 619d28b..0000000 --- a/app-vim/pyclewn/pyclewn-1.7.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" -PYTHON_DEPEND="2" - -inherit distutils vim-doc eutils - -DESCRIPTION="A debugger frontend for gvim written in python" -HOMEPAGE="http://pyclewn.wiki.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.py2.tar.gz" -#SRC_URI="http://sourceforge.net/projects/pyclewn/files/pyclewn-1.7/pyclewn-1.7.py2.tar.gz/download" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" -IUSE="" - -DEPEND="|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.0[netbeans] )" -RDEPEND="${DEPEND} - sys-devel/gdb" - -S="${WORKDIR}/${P}.py2/" - -src_prepare() { - distutils_src_prepare - epatch "${FILESDIR}/pyclewn_install-access-denied.patch" -} - -pkg_postinst() { - update_vim_helptags - distutils_pkg_postinst -} diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest deleted file mode 100644 index 6622bb1..0000000 --- a/dev-python/ipdb/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ipdb-0.3.tar.gz 1766 SHA256 ac5942b03e61a34be920f07c1728cf53d2755c2786145d7783e8a327bcd768ec -EBUILD ipdb-0.3.ebuild 601 SHA256 60f2ded5ea0957df2eb4ee7990b76308e78a2116b340368c23c1a64e27685509 SHA512 20c911729a04d4de9f1d853998ceacf60c147adddc902ccf981a0ecdd884e71888cbea978dc39bfb8fc8c4221cdb0f29d87c663d40c75d65983f2fbc070db9df WHIRLPOOL 9bd9ec7079fc9864b641cd44b38a88936564f79e3bee89fcfa49a2c937657a229c641951ba34ca61d27e0e656ebadcbd92ea9c60fd9a75c45bcb026f1d0b9dc2 diff --git a/dev-python/ipdb/ipdb-0.3.ebuild b/dev-python/ipdb/ipdb-0.3.ebuild deleted file mode 100644 index fed8c17..0000000 --- a/dev-python/ipdb/ipdb-0.3.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit distutils - -MY_PN="ipdb" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Simple wrapper for ipython debugger set_trace()" -HOMEPAGE="http://pypi.python.org/pypi/ipdb" -SRC_URI="mirror://pypi/i/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="GPL" -SLOT="0" -KEYWORDS="x86 amd64" -IUSE="" - -RDEPEND="dev-python/setuptools dev-python/ipython" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - distutils_src_compile -} diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest deleted file mode 100644 index fd63304..0000000 --- a/dev-python/pep8/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST pep8-0.6.1.tar.gz 21499 RMD160 9234bd7776ef09cc06c6f33350f1752d49ec2135 SHA1 206c9942ed79a527db1389052ac9dc272183e85d SHA256 c0654b683bd0c20987e3e767bb0241daf014d854cb89ec84fbed623e349faeec -EBUILD pep8-0.6.1.ebuild 570 RMD160 cc80b607ea1879b5e724fba53b620dcefe891294 SHA1 0566999d4b5724a29f4361f1c8b5ac795662224a SHA256 3b1a6898687844a9a7a7c16fa40f84d1e25f233e998d7f2462f15e0cd899cfc7 diff --git a/dev-python/pep8/pep8-0.6.1.ebuild b/dev-python/pep8/pep8-0.6.1.ebuild deleted file mode 100644 index f748179..0000000 --- a/dev-python/pep8/pep8-0.6.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit distutils - -MY_PN="pep8" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="High-level Python web framework" -HOMEPAGE="http://pypi.python.org/pypi/pep8" -SRC_URI="mirror://pypi/p/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="Expat license" -SLOT="0" -KEYWORDS="x86" -IUSE="" - -RDEPEND="dev-python/setuptools" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - distutils_src_compile -} diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest deleted file mode 100644 index 9551e12..0000000 --- a/games-emulation/sdlmame/Manifest +++ /dev/null @@ -1,19 +0,0 @@ -AUX mame-0.139.ini.in 6688 SHA256 4788e0c7bccc6d286cf1b3cbfe39aa1be6f210a94dea37954d4821a97bfb14da SHA512 e577c18b8403afdce4ae1c95a284ccb3aa4a0c7375f1e1eb2d93396e03f2ed0101d49c786f797a37b7a43e612434fbe368e9af7af9f032b0bc06e3014316d283 WHIRLPOOL 7686f4a28f110efd2d9797a79d46a0dc16094fb86a0d7a688186128a7c59ff256defa788351975e0de9f472c68fd1962a411c8885a8cebee2064d90d14cf7077 -AUX mame-0.159.ini.in 6688 SHA256 4788e0c7bccc6d286cf1b3cbfe39aa1be6f210a94dea37954d4821a97bfb14da SHA512 e577c18b8403afdce4ae1c95a284ccb3aa4a0c7375f1e1eb2d93396e03f2ed0101d49c786f797a37b7a43e612434fbe368e9af7af9f032b0bc06e3014316d283 WHIRLPOOL 7686f4a28f110efd2d9797a79d46a0dc16094fb86a0d7a688186128a7c59ff256defa788351975e0de9f472c68fd1962a411c8885a8cebee2064d90d14cf7077 -AUX sdlmame-0.144-makefile.patch 1934 SHA256 f7b7d9705efa1e3db683fc234d358de99484200c1f6f56b9e9727ffb97234c2a SHA512 739d5c07dbdaabc0d54ec734886ce0672a6966e36730610a05f20c9c32a33429d88c93d2cb6899ae1b054aacb34b06b4074c7bddc1274a2388cd9d0f7ce2927d WHIRLPOOL 0b4ee5b910513608e45a19157f0b6fe4e99f5412113efd846365ebb01f869d5a9529e704ced0f475cb0e3cf8d7ca09ea46e79601489d3759a241c363c9bdcb36 -AUX sdlmame-0.144-no-opengl.patch 309 SHA256 2f2412df37a50bf5e84df5620926dcb2d82a79f4ea1f307e96a18513c44690c4 SHA512 383a4c42ec319846e37f1682382ddcf8c127820f52aafef6f93b4548a2c164945c36534e246a87842ff81f4c8e47e9c9fed4af9e47b4dd4eca1989b527d7dd1c WHIRLPOOL a0e1fcc06ffa453db850fe1cc56071fac809d9b501ae3253b14c29ff413165267b9e77acbb70d80a8617e1f84d08a36c4733d5e81419c26e4712790dfacd8bdb -AUX sdlmame-0.148_p1-makefile.patch 4801 SHA256 1428162c7f80671b4919f81cdf8bdaf0d23cb3596fbf43deefeaabf8f22cbe43 SHA512 d6d6040fdbcce1cee24742fb3242e2c6372c34fd993933e6df8e6e12c1ef488d309f9dbaba23d91528f6e97411d1865c72f9d465176bcf91c95594bf33a2b2ad WHIRLPOOL 4cae6d00b4bcfab9a52e583ba1914c1f84f7a21aff31792e1c485d9f229b0e9b743f28cabc3acafcb5e50e16fb7f4a2843adcba84304013c2a9b0c5eec6b4a27 -AUX sdlmame-0.148_p1-no-opengl.patch 436 SHA256 9c5052e2f942f4841175e260d9914dc052b1bcb9805086bb284758eeb37a918a SHA512 1ea614758b6726b8300d0c4a2c3801b76d59b21d8e121304ebb0700ff6478fe2d386170cf5a21fb553825dae06944b1ff6b020d042ccb888ba63dcd6e400e617 WHIRLPOOL ec79181dad422d0bf2ba5b751a23c69d81d9fe5855133aed28d6e1e32425b67cbd711808c1752fe6c25b5832b327d079085a681fa074126d4fcb1993dc409b8a -AUX sdlmame-0.149-QA.patch 5427 SHA256 c3e8e2cbe358f9c335f62c0c40a2157a9e158ea317c3445ba0f1dd2b74fd8aa3 SHA512 4974f121f4d1a14f9ec57a68504d9f3eb4ac4f518cf515fa8d1f5cdd976409d72f81b948573a8a2cff86c73d4eb5ac8299e119911960bb0575e3fe6e57b0fccb WHIRLPOOL 8e9f76aecdfbb81cb61a457f7a25613c4b9f0fe7f8730cb81bcf2fd0dfb2d434abd9d3901505c152cef93bd0daebed1b35635b262db4fd07bfb8ec04c5ce81da -AUX sdlmame-0.149-debugger-linking.patch 944 SHA256 5e9ed23651cd9f79f1303ef245d933ac94ffd92c8c950dd623bca9c292fc52b0 SHA512 24123983a613530d6bf4f52f2f5d191b1bed997f27384fb34b19c5fa629f8ebb09dceca334138ac93122fa2482834cbdecbfca91f290bcb9ab62bc0db829b99f WHIRLPOOL 31e8deefc11f1bfc58c63b7908ca540e658e2a62170968514aaaf029a6fe251c66eebd01cb7a71cf8b92ac1702209558896dc03f0f7249c6ede6e29ee3447685 -AUX sdlmame-0.149-no-opengl.patch 558 SHA256 9d2b61809532f909439709c97bdcb7d6e167573753ce0166c9d50a60c311465a SHA512 f0a728262855367b2039c68c6bb676f3e957033334dd8d3a8ce82ebb28b51d759408a67c47fd8dd1705a3c883eb9362c633692fdf9dcdfe5a79ccbe19dc44dc8 WHIRLPOOL 6c752080ac2d233e7bbc606d641cd0e80235a8edaefbbe6fedf4e82afab03236575cc14ca60ca5bad768935b7e86dfefdaf1d4f8aac186d5b444464615f155f1 -AUX sdlmame-0.149-system-lua.patch 851 SHA256 2ca1875b4425f1136a29003cdf54283e3785d2488c930e5611a7148c89a17bc1 SHA512 91c73f9992e326595bfa96820985de4ede9029df75e63ab28ac8d55d38021744ba5542178d788f68105d91f233513d26ceaf10c771a19f0545d07f39515c5db2 WHIRLPOOL 1e959a45a3f23bcdce30126976fb06422a90fdd02876615eaad035d5b34afeed4b055197bb84d928268cdf997d2944482d6ab915a1fda9dc3020c613523d6771 -AUX sdlmame-0.159-QA.patch 3317 SHA256 0048d22f37d901730c4fa7006de1dc11735bc8d3341dfd326481a5d72a257927 SHA512 fdfb8c8f7fe334c63a4240867689acb1f63cae2358253090d366c96db2df6adcc061f4080f95f2b42e5c4647a35f08877a5a759b7d302beb5d68c01b8c11bd82 WHIRLPOOL 1bbcc7769e23c362853d779ad5e37781b4b70757c448999396dc72f4971a28c700d378a47bb7714bb9eba0b86028cdcf8da5ce8aa16f48b6ceb4f59bd674a69a -AUX sdlmame-0.159-debugger-linking.patch 592 SHA256 b8df68ec51d5869f706b33bb035ec78c7abf7b198fd7e132b640da1fbcc6e99e SHA512 fd94c3e57b032cc46d44065053a4d71e0a96de8566f5af3af33a0b50e966911e1fb4658a619dd0b1eaef503eee1abb18c44d3df9cd773c0e3aa10f91df932593 WHIRLPOOL 14e8436bca894df4d82d845d3634df2dc5152ac9d82905e87bc32f0295a15cf77240a100e9a0e88c788aa9eee458a921be4f1a0a8e64ccc17be294aae053f36f -AUX sdlmame-0.159-sdl_ttf.patch 1009 SHA256 a548a6f7e584bab10ad9559185e69564a388d8cc66d732c1cb84146ca3075197 SHA512 421ec61d784447f6c4c1177f03a1e2e42fd1fd145dd3c90dc7274bec71dbdd65b4b37b1195408ddca7963a745215e7aee27983d381532179a57157c91f4976d8 WHIRLPOOL ffb1bba6963d8d23d3b195b2f06d1665d07f4fce8784cd7596206ca6b93714c4b57da2b8ca40c74193c201c69f6c073d46455e0cfbefe0826ce5ee7f4028c403 -AUX vector.ini 116 SHA256 408aeaaffcb2ecccd20db457f22d2d5efa930c0f62a92987b0fbefaf6c038c23 SHA512 6d84eb7b9c4e9f134b57e64ba9ae30dcaaa620296830f7c9858611fde9064f803bd7d230a989a5cce34d8b815b5a98d323b19d3eef3d4c688b5c32b96b299f5f WHIRLPOOL f60543015a0195487917c696640cc66e29109298ac8f9bd1309346f6ab1b46d8e2ce83d00506c17a9ea588f6b3bac82f0f66d7e75bbf88656ba897cd50fa3dac -DIST mame0148s.zip 33822494 SHA256 78d8a68ba53934fdfc895f450c08682dada81f7ec3e74a98fb042539506d9321 SHA512 a520115e2e82b2da3200ffa1fa56f668f95c3e26a927bcdb30a34e73053e55d26a6a6c1ec95eae1237bce1d2d0cd276b84466705fd5f53ac77827d06ea04bc03 WHIRLPOOL c6de71c198396977475110ab5840b7eaa6e5074519adffc286dd539ab916ea951fa1c307218b0d144cdc8aeeb096216106a3c21a6d53b42c04dc75e8103be04a -DIST sdlmame-ui.bdf.gz 114727 SHA256 f2ec11dd926bbeae8647e68607107516a30790239464939f3e99a0f62fc7f17e SHA512 67ba1bc632c1ac51b97acf8c1061477edd3519fea3d1233951723741c926ff72e259c274babb036abf4db92f217db507c58a6fc6e438db4b14c5fe5789b2ed64 WHIRLPOOL 2150053b38d8318804bf40cdcd9cdefdd2976c4cfab563c90021f0d9be0a0a57174166ece8b51658d9f2192e07343f198358299667a1db32f146c9fb9c528956 -DIST sdlmame0148u1_diff.zip 3386949 SHA256 27378d09e50f31ca0dd4f39df4c474016671946657eb7af9ea5aa0ffbae1d9bb SHA512 f62aa8ebfc3cfa96d2fd5e58c921cc2adfbe3704a745ef49bc247060ecd3333ecc12e1a3add810c6237f3f7a1946cf1b9d46e6d72aeb87baffebadb933de44de WHIRLPOOL 550f2e777363f307b8e56b4ec31f4852abe89434af5ce596bd6e6023f35a728e4078033b1edc4b302e0cf50fa646a190ec02be9329127379405aec2e9b591531 -EBUILD sdlmame-0.148_p1-r88.ebuild 4786 SHA256 d604ff02f53305ca7848f18013c248c17229c7aae9aae2b1c7c4c72c64c58d90 SHA512 61f72be57642e89896ea9fcea8c29b15ef7f22b1db4b1392af1a73354f2e65ccdbe5b95288511310eab75e1990e1b10f94fd44df08dd809ec3ec3fdacd1237bd WHIRLPOOL 4745a04c7ea5995e397778597161fd517a87ea8d805ce914e5ca523e3026c54600b3984f619de24def0c8a31d23de209eec408a46f8c8bf1e96123b9b58eb056 -MISC Manifest.orig 6879 SHA256 1b277c4bec7e2bb74bf2b3511dfee6aa585ebab7d467b75519f32a996ceacd01 SHA512 b07fb2b59051d1e49d47717dc5fa24a22688349d12cbf70fd0478f1bc8e0616e69719c46b5e4fcf736993f6aa220f39c72a70a99c12405b7562c8b7766cdeb7f WHIRLPOOL 67222e87a3b42696adbea20a7c44eb0a58e2bf8aa8c953cc23da9cfc058140187c4d32e07796f1af0faf7d08af47333cbaba01c7327fe2f7a367a5bfec440ea4 diff --git a/games-emulation/sdlmame/files/mame-0.139.ini.in b/games-emulation/sdlmame/files/mame-0.139.ini.in deleted file mode 100644 index 7b69f18..0000000 --- a/games-emulation/sdlmame/files/mame-0.139.ini.in +++ /dev/null @@ -1,270 +0,0 @@ -# -# CORE CONFIGURATION OPTIONS -# -readconfig 1 -writeconfig 0 - -# -# CORE SEARCH PATH OPTIONS -# -rompath $HOME/.sdlmame/roms;@GAMES_DATADIR@/sdlmame/roms -samplepath $HOME/.sdlmame/samples;@GAMES_DATADIR@/sdlmame/samples -artpath $HOME/.sdlmame/artwork;@GAMES_DATADIR@/sdlmame/artwork -ctrlrpath $HOME/.sdlmame/ctrlr;@GAMES_SYSCONFDIR@/sdlmame/ctrlr;@GAMES_DATADIR@/sdlmame/ctrlr -inipath $HOME/.sdlmame;@GAMES_SYSCONFDIR@/sdlmame -fontpath $HOME/.sdlmame;@GAMES_DATADIR@/sdlmame -cheatpath $HOME/.sdlmame/cheats;@GAMES_SYSCONFDIR@/sdlmame/cheats;@GAMES_DATADIR@/sdlmame/cheats -crosshairpath $HOME/.sdlmame/crosshair;@GAMES_DATADIR@/sdlmame/crosshair - -# -# CORE OUTPUT DIRECTORY OPTIONS -# -cfg_directory $HOME/.sdlmame/cfg -nvram_directory $HOME/.sdlmame/nvram -memcard_directory $HOME/.sdlmame/memcard -input_directory $HOME/.sdlmame/inp -state_directory $HOME/.sdlmame/sta -snapshot_directory $HOME/.sdlmame/snap -diff_directory $HOME/.sdlmame/diff -comment_directory $HOME/.sdlmame/comments - -# -# CORE STATE/PLAYBACK OPTIONS -# -state -autosave 0 -playback -record -mngwrite -aviwrite -wavwrite -snapname %g/%i -snapsize auto -snapview internal -burnin 0 - -# -# CORE PERFORMANCE OPTIONS -# -autoframeskip 0 -frameskip 0 -seconds_to_run 0 -throttle 1 -sleep 1 -speed 1.0 -refreshspeed 0 - -# -# CORE ROTATION OPTIONS -# -rotate 1 -ror 0 -rol 0 -autoror 0 -autorol 0 -flipx 0 -flipy 0 - -# -# CORE ARTWORK OPTIONS -# -artwork_crop 0 -use_backdrops 1 -use_overlays 1 -use_bezels 1 - -# -# CORE SCREEN OPTIONS -# -brightness 1.0 -contrast 1.0 -gamma 1.0 -pause_brightness 0.65 - -# -# CORE VECTOR OPTIONS -# -antialias 1 -beam 1.0 -flicker 0 - -# -# CORE SOUND OPTIONS -# -sound 1 -samplerate 48000 -samples 1 -volume 0 - -# -# CORE INPUT OPTIONS -# -coin_lockout 1 -ctrlr -mouse 0 -joystick 1 -lightgun 0 -multikeyboard 0 -multimouse 0 -steadykey 0 -offscreen_reload 0 -joystick_map auto -joystick_deadzone 0.3 -joystick_saturation 0.85 -natural 0 -uimodekey auto - -# -# CORE INPUT AUTOMATIC ENABLE OPTIONS -# -paddle_device keyboard -adstick_device keyboard -pedal_device keyboard -dial_device keyboard -trackball_device keyboard -lightgun_device keyboard -positional_device keyboard -mouse_device mouse - -# -# CORE DEBUGGING OPTIONS -# -log 0 -verbose 0 -update_in_pause 0 -debug 0 -debugscript -debug_internal 0 - -# -# CORE MISC OPTIONS -# -bios -cheat 0 -skip_gameinfo 0 - -# -# DEBUGGING OPTIONS -# -oslog 0 - -# -# PERFORMANCE OPTIONS -# -multithreading 0 -numprocessors auto -sdlvideofps 0 - -# -# VIDEO OPTIONS -# -video soft -numscreens 1 -window 0 -maximize 1 -keepaspect 1 -unevenstretch 1 -effect none -centerh 1 -centerv 1 -waitvsync 0 -scalemode none - -# -# OpenGL-SPECIFIC OPTIONS -# -filter 1 -prescale 1 -gl_forcepow2texture 0 -gl_notexturerect 0 -gl_vbo 1 -gl_pbo 1 -gl_glsl 0 -gl_glsl_filter 1 -glsl_shader_mame0 none -glsl_shader_mame1 none -glsl_shader_mame2 none -glsl_shader_mame3 none -glsl_shader_mame4 none -glsl_shader_mame5 none -glsl_shader_mame6 none -glsl_shader_mame7 none -glsl_shader_mame8 none -glsl_shader_mame9 none -glsl_shader_screen0 none -glsl_shader_screen1 none -glsl_shader_screen2 none -glsl_shader_screen3 none -glsl_shader_screen4 none -glsl_shader_screen5 none -glsl_shader_screen6 none -glsl_shader_screen7 none -glsl_shader_screen8 none -glsl_shader_screen9 none -gl_glsl_vid_attr 1 - -# -# PER-WINDOW VIDEO OPTIONS -# -screen auto -aspect auto -resolution auto -view auto -screen0 auto -aspect0 auto -resolution0 auto -view0 auto -screen1 auto -aspect1 auto -resolution1 auto -view1 auto -screen2 auto -aspect2 auto -resolution2 auto -view2 auto -screen3 auto -aspect3 auto -resolution3 auto -view3 auto - -# -# FULL SCREEN OPTIONS -# -switchres 0 -useallheads 0 - -# -# SOUND OPTIONS -# -audio_latency 3 - -# -# SDL KEYBOARD MAPPING -# -keymap 0 -keymap_file $HOME/.sdlmame/keymap.dat -#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-be.txt -#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-ch.txt -#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-de.txt -#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km-fr.txt -#keymap_file @GAMES_DATADIR@/sdlmame/keymaps/km_it.txt - -# -# SDL JOYSTICK MAPPING -# -joy_idx1 auto -joy_idx2 auto -joy_idx3 auto -joy_idx4 auto -joy_idx5 auto -joy_idx6 auto -joy_idx7 auto -joy_idx8 auto -sixaxis 0 - -# -# SDL LOWLEVEL DRIVER OPTIONS -# -videodriver auto -audiodriver auto -gl_lib auto diff --git a/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch deleted file mode 100644 index f69cfe4..0000000 --- a/games-emulation/sdlmame/files/sdlmame-0.144-makefile.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- work.orig/makefile 2011-11-09 22:40:30.000000000 -0500 -+++ work/makefile 2011-11-16 19:24:24.615419949 -0500 -@@ -435,9 +435,6 @@ - CPPONLYFLAGS += -x c++ -std=gnu++98 - COBJFLAGS += -x objective-c++ - --# this speeds it up a bit by piping between the preprocessor/compiler/assembler --CCOMFLAGS += -pipe -- - # add -g if we need symbols, and ensure we have frame pointers - ifdef SYMBOLS - CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer -@@ -442,7 +442,6 @@ - - # add -v if we need verbose build information - ifdef VERBOSE --CCOMFLAGS += -v - endif - - # add profiling information for the compiler -@@ -453,23 +450,6 @@ - CCOMFLAGS += -pg - endif - --# add the optimization flag --CCOMFLAGS += -O$(OPTIMIZE) -- --# if we are optimizing, include optimization options --# and make all errors into warnings --ifneq ($(OPTIMIZE),0) --ifneq ($(TARGETOS),os2) --ifndef NOWERROR --CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS) --else --CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) --endif --else --CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) --endif --endif -- - # add a basic set of warnings - CCOMFLAGS += \ - -Wall \ -@@ -524,20 +504,6 @@ - endif - - --#------------------------------------------------- --# linking flags --#------------------------------------------------- -- --# LDFLAGS are used generally; LDFLAGSEMULATOR are additional --# flags only used when linking the core emulator --LDFLAGS = --ifneq ($(TARGETOS),macosx) --ifneq ($(TARGETOS),os2) --ifneq ($(TARGETOS),solaris) --LDFLAGS = -Wl,--warn-common --endif --endif --endif - LDFLAGSEMULATOR = - - # add profiling information for the linker -@@ -545,13 +511,6 @@ - LDFLAGS += -pg - endif - --# strip symbols and other metadata in non-symbols and non profiling builds --ifndef SYMBOLS --ifneq ($(TARGETOS),macosx) --LDFLAGS += -s --endif --endif -- - # output a map file (emulator only) - ifdef MAP - LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map diff --git a/games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch deleted file mode 100644 index 87eeae5..0000000 --- a/games-emulation/sdlmame/files/sdlmame-0.144-no-opengl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/osd/sdl/osdsdl.h.orig -+++ ./src/osd/sdl/osdsdl.h -@@ -225,6 +225,8 @@ - const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); } - #if USE_OPENGL - const char *gl_lib() const { return value(SDLOPTION_GL_LIB); } -+#else -+ const char *gl_lib() const { return NULL; } - #endif - - private: diff --git a/games-emulation/sdlmame/files/sdlmame-0.148_p1-makefile.patch b/games-emulation/sdlmame/files/sdlmame-0.148_p1-makefile.patch deleted file mode 100644 index 7ba5969..0000000 --- a/games-emulation/sdlmame/files/sdlmame-0.148_p1-makefile.patch +++ /dev/null @@ -1,177 +0,0 @@ ---- makefile -+++ makefile -@@ -314,13 +314,14 @@ - endif - - # compiler, linker and utilities --AR = @ar --CC = @gcc --LD = @g++ -+AR ?= @ar -+CC ?= @gcc -+CXX ?= @g++ -+LD = $(CXX) - MD = -mkdir$(EXE) - RM = @rm -f - OBJDUMP = @objdump --PYTHON = @python -+PYTHON ?= @python - - - #------------------------------------------------- -@@ -455,7 +456,7 @@ - - # CFLAGS is defined based on C or C++ targets - # (remember, expansion only happens when used, so doing it here is ok) --CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) -+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS) - - # we compile C-only to C89 standard with GNU extensions - # we compile C++ code to C++98 standard with GNU extensions -@@ -463,9 +464,6 @@ - CPPONLYFLAGS += -x c++ -std=gnu++98 - COBJFLAGS += -x objective-c++ - --# this speeds it up a bit by piping between the preprocessor/compiler/assembler --CCOMFLAGS += -pipe -- - # add -g if we need symbols, and ensure we have frame pointers - ifdef SYMBOLS - CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer -@@ -479,19 +477,6 @@ - # add profiling information for the compiler - ifdef PROFILE - CCOMFLAGS += -pg --endif -- --# add the optimization flag --CCOMFLAGS += -O$(OPTIMIZE) -- --# add the error warning flag --ifndef NOWERROR --CCOMFLAGS += -Werror --endif -- --# if we are optimizing, include optimization options --ifneq ($(OPTIMIZE),0) --CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) - endif - - # add a basic set of warnings -@@ -565,26 +550,11 @@ - - # LDFLAGS are used generally; LDFLAGSEMULATOR are additional - # flags only used when linking the core emulator --LDFLAGS = --ifneq ($(TARGETOS),macosx) --ifneq ($(TARGETOS),os2) --ifneq ($(TARGETOS),solaris) --LDFLAGS = -Wl,--warn-common --endif --endif --endif - LDFLAGSEMULATOR = - - # add profiling information for the linker - ifdef PROFILE - LDFLAGS += -pg --endif -- --# strip symbols and other metadata in non-symbols and non profiling builds --ifndef SYMBOLS --ifneq ($(TARGETOS),macosx) --LDFLAGS += -s --endif - endif - - # output a map file (emulator only) ---- src/osd/sdl/sdl.mak -+++ src/osd/sdl/sdl.mak -@@ -24,6 +24,8 @@ - # uncomment and edit next line to specify a distribution - # supported debian-stable, ubuntu-intrepid - -+PKG_CONFIG ?= pkg-config -+ - # DISTRO = debian-stable - # DISTRO = ubuntu-intrepid - # DISTRO = gcc44-generic -@@ -91,9 +93,9 @@ - endif - - ifdef SDL_INSTALL_ROOT --SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config -+SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config - else --SDL_CONFIG = $(SDL_LIBVER)-config -+SDL_CONFIG ?= $(SDL_LIBVER)-config - endif - - ifeq ($(SDL_LIBVER),sdl2) -@@ -190,8 +192,8 @@ - SDL_NETWORK = taptun - - ifndef NO_USE_MIDI --INCPATH += `pkg-config --cflags alsa` --LIBS += `pkg-config --libs alsa` -+INCPATH += $(shell $(PKG_CONFIG) --cflags alsa) -+LIBS += $(shell $(PKG_CONFIG) --libs alsa) - endif - - endif -@@ -476,10 +478,10 @@ - # Remove the "/SDL" component from the include path so that we can compile - # files (header files are #include "SDL/something.h", so the extra "/SDL" - # causes a significant problem) --INCPATH += `sdl-config --cflags | sed 's:/SDL::'` -+INCPATH += $(shell $(SDL_CONFIG) --cflags | sed 's:/SDL::') - CCOMFLAGS += -DNO_SDL_GLEXT - # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m --LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread -+LIBS += $(shell $(SDL_CONFIG) --libs | sed 's/-lSDLmain//') -lpthread - DEFS += -DMACOSX_USE_LIBSDL - endif # MACOSX_USE_LIBSDL - -@@ -532,8 +534,8 @@ - endif - endif - --INCPATH += `pkg-config --cflags fontconfig` --LIBS += `pkg-config --libs fontconfig` -+INCPATH += $(shell $(PKG_CONFIG) --cflags fontconfig) -+LIBS += $(shell $(PKG_CONFIG) --libs fontconfig) - - ifeq ($(SDL_LIBVER),sdl2) - LIBS += -lSDL2_ttf -@@ -616,8 +618,8 @@ - - ifeq ($(BASE_TARGETOS),os2) - --INCPATH += `sdl-config --cflags` --LIBS += `sdl-config --libs` -+INCPATH += $(shell $(SDL_CONFIG) --cflags) -+LIBS += $(shell $(SDL_CONFIG) --libs) - - endif # OS2 - -@@ -690,15 +692,15 @@ - - # the new debugger relies on GTK+ in addition to the base SDLMAME needs - # Non-X11 builds can not use the debugger --INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0` --CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0` --LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0` -+INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0) -+CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0) -+LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0) - #CCOMFLAGS += -DGTK_DISABLE_DEPRECATED - - # The newer debugger uses QT - ifdef USE_QTDEBUG --INCPATH += `pkg-config QtGui --cflags` --LIBS += `pkg-config QtGui --libs` -+INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags) -+LIBS += $(shell $(PKG_CONFIG) QtGui --libs) - endif - - # some systems still put important things in a different prefix diff --git a/games-emulation/sdlmame/files/sdlmame-0.148_p1-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.148_p1-no-opengl.patch deleted file mode 100644 index 7b339ba..0000000 --- a/games-emulation/sdlmame/files/sdlmame-0.148_p1-no-opengl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h ---- a/src/osd/sdl/osdsdl.h 2012-07-11 20:49:55.070264487 +0200 -+++ b/src/osd/sdl/osdsdl.h 2012-07-11 20:51:45.976264395 +0200 -@@ -216,6 +216,8 @@ - const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); } - #if USE_OPENGL - const char *gl_lib() const { return value(SDLOPTION_GL_LIB); } -+#else -+ const char *gl_lib() const { return NULL; } - #endif - - private: diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-QA.patch b/games-emulation/sdlmame/files/sdlmame-0.149-QA.patch deleted file mode 100644 index 97e4b8f..0000000 --- a/games-emulation/sdlmame/files/sdlmame-0.149-QA.patch +++ /dev/null @@ -1,191 +0,0 @@ -commit 938cfdf1f01bcc9ac736249ee6458a774d560738 -Author: hasufell -Date: Tue Jun 25 23:48:02 2013 +0200 - - QA: respect several environment variables - - such as CC,CFLAGS,PKG_CONFIG... - -diff --git a/makefile b/makefile -index ad6ae2d..dd4598d 100644 ---- a/makefile -+++ b/makefile -@@ -317,13 +317,15 @@ BUILD_EXE = $(EXE) - endif - - # compiler, linker and utilities --AR = @ar --CC = @gcc --LD = @g++ -+AR ?= @ar -+CC ?= @gcc -+CXX ?= @g++ -+LD = $(CXX) - MD = -mkdir$(EXE) - RM = @rm -f - OBJDUMP = @objdump --PYTHON = @python -+PYTHON ?= @python -+PKG_CONFIG ?= pkg-config - - - #------------------------------------------------- -@@ -458,7 +460,7 @@ CPPONLYFLAGS = - - # CFLAGS is defined based on C or C++ targets - # (remember, expansion only happens when used, so doing it here is ok) --CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) -+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS) - - # we compile C-only to C89 standard with GNU extensions - # we compile C++ code to C++98 standard with GNU extensions -@@ -466,9 +468,6 @@ CONLYFLAGS += -std=gnu89 - CPPONLYFLAGS += -x c++ -std=gnu++98 - COBJFLAGS += -x objective-c++ - --# this speeds it up a bit by piping between the preprocessor/compiler/assembler --CCOMFLAGS += -pipe -- - # add -g if we need symbols, and ensure we have frame pointers - ifdef SYMBOLS - CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer -@@ -484,19 +483,6 @@ ifdef PROFILE - CCOMFLAGS += -pg - endif - --# add the optimization flag --CCOMFLAGS += -O$(OPTIMIZE) -- --# add the error warning flag --ifndef NOWERROR --CCOMFLAGS += -Werror --endif -- --# if we are optimizing, include optimization options --ifneq ($(OPTIMIZE),0) --CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) --endif -- - # add a basic set of warnings - CCOMFLAGS += \ - -Wall \ -@@ -576,14 +562,6 @@ endif - - # LDFLAGS are used generally; LDFLAGSEMULATOR are additional - # flags only used when linking the core emulator --LDFLAGS = --ifneq ($(TARGETOS),macosx) --ifneq ($(TARGETOS),os2) --ifneq ($(TARGETOS),solaris) --LDFLAGS = -Wl,--warn-common --endif --endif --endif - LDFLAGSEMULATOR = - - # add profiling information for the linker -@@ -591,13 +569,6 @@ ifdef PROFILE - LDFLAGS += -pg - endif - --# strip symbols and other metadata in non-symbols and non profiling builds --ifndef SYMBOLS --ifneq ($(TARGETOS),macosx) --LDFLAGS += -s --endif --endif -- - # output a map file (emulator only) - ifdef MAP - LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map -diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak -index 84332ef..36655d3 100644 ---- a/src/osd/sdl/sdl.mak -+++ b/src/osd/sdl/sdl.mak -@@ -24,6 +24,8 @@ - # uncomment and edit next line to specify a distribution - # supported debian-stable, ubuntu-intrepid - -+PKG_CONFIG ?= pkg-config -+ - # DISTRO = debian-stable - # DISTRO = ubuntu-intrepid - # DISTRO = gcc44-generic -@@ -88,9 +90,9 @@ SDL_LIBVER = sdl - endif - - ifdef SDL_INSTALL_ROOT --SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config -+SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config - else --SDL_CONFIG = $(SDL_LIBVER)-config -+SDL_CONFIG ?= $(SDL_LIBVER)-config - endif - - ifeq ($(SDL_LIBVER),sdl2) -@@ -187,8 +189,8 @@ SYNC_IMPLEMENTATION = tc - SDL_NETWORK = taptun - - ifndef NO_USE_MIDI --INCPATH += `pkg-config --cflags alsa` --LIBS += `pkg-config --libs alsa` -+INCPATH += $(shell $(PKG_CONFIG) --cflags alsa) -+LIBS += $(shell $(PKG_CONFIG) --libs alsa) - endif - - endif -@@ -478,10 +480,10 @@ else - # Remove the "/SDL" component from the include path so that we can compile - # files (header files are #include "SDL/something.h", so the extra "/SDL" - # causes a significant problem) --INCPATH += `sdl-config --cflags | sed 's:/SDL::'` -+INCPATH += $(shell $(SDL_CONFIG) --cflags | sed 's:/SDL::') - CCOMFLAGS += -DNO_SDL_GLEXT - # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m --LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread -+LIBS += $(shell $(SDL_CONFIG) --libs | sed 's/-lSDLmain//') -lpthread - DEFS += -DMACOSX_USE_LIBSDL - endif # MACOSX_USE_LIBSDL - -@@ -534,8 +536,8 @@ INCPATH += -I$(SDL_INSTALL_ROOT)/include/directfb - endif - endif - --INCPATH += `pkg-config --cflags fontconfig` --LIBS += `pkg-config --libs fontconfig` -+INCPATH += $(shell $(PKG_CONFIG) --cflags fontconfig) -+LIBS += $(shell $(PKG_CONFIG) --libs fontconfig) - - ifeq ($(SDL_LIBVER),sdl2) - LIBS += -lSDL2_ttf -@@ -620,8 +622,8 @@ endif # Win32 - - ifeq ($(BASE_TARGETOS),os2) - --INCPATH += `sdl-config --cflags` --LIBS += `sdl-config --libs` -+INCPATH += $(shell $(SDL_CONFIG) --cflags) -+LIBS += $(shell $(SDL_CONFIG) --libs) - - endif # OS2 - -@@ -696,14 +698,14 @@ LIBS += -lX11 -lXinerama - - # The newer debugger uses QT - ifndef NO_USE_QTDEBUG --INCPATH += `pkg-config QtGui --cflags` --LIBS += `pkg-config QtGui --libs` -+INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags) -+LIBS += $(shell $(PKG_CONFIG) QtGui --libs) - else - # the old-new debugger relies on GTK+ in addition to the base SDLMAME needs - # Non-X11 builds can not use the debugger --INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0` --CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0` --LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0` -+INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0) -+CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0) -+LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0) - endif - - # some systems still put important things in a different prefix diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-debugger-linking.patch b/games-emulation/sdlmame/files/sdlmame-0.149-debugger-linking.patch deleted file mode 100644 index 6c7cd5d..0000000 --- a/games-emulation/sdlmame/files/sdlmame-0.149-debugger-linking.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit ec92ac2b0180b101c30748e62eb8b76cdf0cb439 -Author: hasufell -Date: Wed Jun 26 14:33:01 2013 +0200 - - remove unneeded linking - - if we don't build the debugger, we don't want gtk+ linking - -diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak -index 36655d3..2089707 100644 ---- a/src/osd/sdl/sdl.mak -+++ b/src/osd/sdl/sdl.mak -@@ -696,6 +696,7 @@ else - DEFS += -DSDLMAME_X11 - LIBS += -lX11 -lXinerama - -+ifneq ($(NO_DEBUGGER),1) - # The newer debugger uses QT - ifndef NO_USE_QTDEBUG - INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags) -@@ -707,6 +708,7 @@ INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0) - CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0) - LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0) - endif -+endif # NO_DEBUGGER - - # some systems still put important things in a different prefix - LIBS += -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/openwin/lib diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-no-opengl.patch b/games-emulation/sdlmame/files/sdlmame-0.149-no-opengl.patch deleted file mode 100644 index cd32cd3..0000000 --- a/games-emulation/sdlmame/files/sdlmame-0.149-no-opengl.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 6ee372b3693857372a7b4855039ad1a94d3aebca -Author: hasufell -Date: Tue Jun 25 23:51:12 2013 +0200 - - fix for disabled opengl - -diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h -index ed0b66b..03d68f9 100644 ---- a/src/osd/sdl/osdsdl.h -+++ b/src/osd/sdl/osdsdl.h -@@ -219,6 +219,8 @@ public: - const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); } - #if USE_OPENGL - const char *gl_lib() const { return value(SDLOPTION_GL_LIB); } -+#else -+ const char *gl_lib() const { return NULL; } - #endif - - private: diff --git a/games-emulation/sdlmame/files/sdlmame-0.149-system-lua.patch b/games-emulation/sdlmame/files/sdlmame-0.149-system-lua.patch deleted file mode 100644 index 8460497..0000000 --- a/games-emulation/sdlmame/files/sdlmame-0.149-system-lua.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit ea514c9ded266aa365976649d88fa5593ef7ebf5 -Author: hasufell -Date: Tue Jun 25 23:48:26 2013 +0200 - - add switch to use system lua - -diff --git a/makefile b/makefile -index dd4598d..bdf22d2 100644 ---- a/makefile -+++ b/makefile -@@ -228,6 +228,9 @@ BUILD_JPEGLIB = 1 - # uncomment next line to build PortMidi as part of MAME/MESS build - BUILD_MIDILIB = 1 - -+# uncomment next line to build Lua-5.2 as part of MAME/MESS build -+BUILD_LUA = 1 -+ - # uncomment next line to include the symbols - # SYMBOLS = 1 - -@@ -664,7 +667,12 @@ SOFTFLOAT = $(OBJ)/libsoftfloat.a - FORMATS_LIB = $(OBJ)/libformats.a - - # add LUA library -+ifeq ($(BUILD_LUA),1) - LUA_LIB = $(OBJ)/liblua.a -+else -+LIBS += $(shell $(PKG_CONFIG) --libs lua) -+INCPATH += $(shell $(PKG_CONFIG) --cflags lua) -+endif - - # add PortMidi MIDI library - ifeq ($(BUILD_MIDILIB),1) diff --git a/games-emulation/sdlmame/files/vector.ini b/games-emulation/sdlmame/files/vector.ini deleted file mode 100644 index d4906e3..0000000 --- a/games-emulation/sdlmame/files/vector.ini +++ /dev/null @@ -1,9 +0,0 @@ -# -# Specific options file for vector games -# - -# -# VIDEO OPTIONS -# -video soft -yuvmode yv12 diff --git a/games-emulation/sdlmame/sdlmame-0.148_p1-r88.ebuild b/games-emulation/sdlmame/sdlmame-0.148_p1-r88.ebuild deleted file mode 100644 index a09db7f..0000000 --- a/games-emulation/sdlmame/sdlmame-0.148_p1-r88.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/sdlmame/sdlmame-0.148_p1-r1.ebuild,v 1.6 2015/04/08 18:10:41 mgorny Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic python-any-r1 games - -MY_PV=${PV/.} -MY_CONF_PN=${PN/sdl} -MY_P=sdlmame${MY_PV} -MY_P=${MY_P%%_p*} -MY_CONF_VER="0.139" - -# patches -SRC_URI="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "http://dev.gentoo.org/~hasufell/distfiles/${MY_P}u${PATCH_VER}_diff.zip"; done)" - -DESCRIPTION="Multiple Arcade Machine Emulator (SDL)" -HOMEPAGE="http://mamedev.org/" -# Upstream doesn't allow fetching with unknown User-Agent such as wget -SRC_URI="$SRC_URI http://dev.gentoo.org/~hasufell/distfiles/${MY_P/sdl}s.zip" -if [[ ${PN} == "sdlmame" ]] ; then - SRC_URI="$SRC_URI http://www.netswarm.net/misc/sdlmame-ui.bdf.gz" -fi - -LICENSE="XMAME" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="X alsa debug opengl" -REQUIRED_USE="debug? ( X )" - -RDEPEND="dev-libs/expat - media-libs/fontconfig - media-libs/flac - >=media-libs/libsdl-1.2.10[X,sound,joystick,opengl?,video] - media-libs/sdl-ttf - sys-libs/zlib - virtual/jpeg - alsa? ( media-libs/alsa-lib ) - X? ( - gnome-base/gconf - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXinerama - )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-arch/unzip - media-libs/alsa-lib - virtual/pkgconfig - X? ( x11-proto/xineramaproto )" - -S=${WORKDIR} - -# Function to disable a makefile option -disable_feature() { - sed -i \ - -e "/$1.*=/s:^:# :" \ - "${S}"/makefile \ - || die "sed failed" -} - -# Function to enable a makefile option -enable_feature() { - sed -i \ - -e "/^#.*$1.*=/s:^#::" \ - "${S}"/${2:-makefile} \ - || die "sed failed" -} - -pkg_setup() { - games_pkg_setup - python-any-r1_pkg_setup -} - -src_unpack() { - default - unpack ./mame.zip - rm -f mame.zip -} - -src_prepare() { - if [[ $PV == *_p* ]] ; then - edos2unix $(find $(grep +++ *diff | awk '{ print $2 }' | sort -u) 2>/dev/null) *diff - einfo "Patching release with source updates" - epatch ${MY_PV%%_p*}*.diff - fi - edos2unix src/osd/sdl/osdsdl.h - - epatch \ - "${FILESDIR}"/${P}-makefile.patch \ - "${FILESDIR}"/${P}-no-opengl.patch - - #sed -i \ - # -e "s/^CONLYFLAGS =/CONLYFLAGS = --std=c99/" \ - # "${S}"/makefile \ - # || die "sed failed" - - #sed -i \ - # -e "s/^CONLYFLAGS =/CONLYFLAGS = --std=c99 -fPIC/" \ - # "${S}"/makefile \ - # || die "sed failed" - - sed -i \ - -e "s/memcpy/memmove/" \ - "${S}"/src/emu/cpu/m68000/m68kmake.c \ - || die "sed failed" - - # Don't compile zlib and expat - einfo "Disabling embedded libraries: expat, flac, jpeg, zlib" - disable_feature BUILD_EXPAT - disable_feature BUILD_FLAC - disable_feature BUILD_JPEG - disable_feature BUILD_ZLIB - - if use amd64; then - einfo "Enabling 64-bit support" - enable_feature PTR64 - fi - - if use ppc; then - einfo "Enabling PPC support" - enable_feature BIGENDIAN - fi - - if use debug; then - einfo "Enabling debug support" - enable_feature DEBUG - fi - - if ! use opengl ; then - einfo "Disabling opengl support" - enable_feature NO_OPENGL src/osd/sdl/sdl.mak - fi - - if ! use alsa ; then - einfo "Disabling alsa midi support" - enable_feature NO_USE_MIDI src/osd/sdl/sdl.mak - fi - - if ! use X ; then - einfo "Disabling X support" - enable_feature NO_X11 src/osd/sdl/sdl.mak - fi -} - -src_compile() { - emake \ - TARGET="${PN#sdl}" \ - NAME="${PN}" \ - OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"' \ - NO_DEBUGGER=$(usex debug "0" "1") default -} -# -src_install() { - newgamesbin ${PN}$(use amd64 && echo 64)$(use debug && echo d) ${PN} - - newman src/osd/sdl/man/${PN#sdl}.6 ${PN}.6 - - insinto "${GAMES_DATADIR}/${PN}" - doins -r src/osd/sdl/keymaps - [[ ${PN} == "sdlmame" ]] && newins sdlmame-ui.bdf ui.bdf - - insinto "${GAMES_SYSCONFDIR}/${PN}" - doins "${FILESDIR}"/vector.ini - - sed \ - -e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \ - -e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \ - "${FILESDIR}/${MY_CONF_PN}-${MY_CONF_VER}".ini.in > "${D}/${GAMES_SYSCONFDIR}/${PN}/${MY_CONF_PN}".ini \ - || die "sed failed" - - dodoc docs/{config,mame,newvideo}.txt - if [[ ${PN} == "sdlmame" ]] ; then - dodoc whatsnew*.txt - else - dodoc messnew*.txt - fi - - keepdir \ - "${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \ - "${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats} - - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - - elog "optional dependencies:" - elog " games-emulation/sdlmametools (development tools)" - echo - elog "It's strongly recommended that you change either the system-wide" - elog "${MY_CONF_PN}.ini at \"${GAMES_SYSCONFDIR}/${PN}\" or use a per-user setup at \$HOME/.${PN}" - - if use opengl; then - echo - elog "You built ${PN} with opengl support and should set" - elog "\"video\" to \"opengl\" in ${MY_CONF_PN}.ini to take advantage of that" - fi -} diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest deleted file mode 100644 index 921b7a9..0000000 --- a/mail-client/sylpheed/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX sylpheed-3.1.4-menu_key_support.patch 9901 SHA256 821fde5e114cbea349ec92faa1d03e4e7a0c114ef4f4a0e22db6b6068e61e41e SHA512 490fea7dbf25f927d1977dcce29498b0dad84ec1c1dc9d960af960ec2c29753ee5536c67ee71f5a674e54c0954dbb10ea193f91908c55729718ea05fe285c8d8 WHIRLPOOL 0061b93e4375abc20e7e9fcb0ebac6a94b02163a4ed3d04e1ba4dce328b353e7c1e90bd2ab501c127677fee2d7ebd773e7a0c06367451aa414578995b64a924e -AUX sylpheed-r3033.diff 662 SHA256 deb989aac7eb818a40ae59053359f60bd642d3f1f39c78a4ccb3568e47c4734a SHA512 e2bb8c57ee6557a95a267d5833df4c1b187054392f343083af0652e8a303cf5f4eb7fcf57aca1e9209868af15e83e86133316e385bf535ab8f613e32a7a48bdb WHIRLPOOL c70b593e79d01e3cb4e931ca132e9392d7be7fe5524c5ee3c3314c67b0ebcd65da42f4eba82470c91a125c9196af958c30a6d35cf35a6f447b65cb2054a1c1c3 -DIST sylpheed-3.1.4.tar.bz2 3239023 SHA256 5bd4105b78a65070000375193c506fda09c1e0471403f7b9e225cfca904c93ab SHA512 01fb1749b80cb485b863ab9e1d08c8ea9bc47e411f898fde3567f126db935a1bc51a65b093e39e2d5026522bea0cd2ddff284fa574355bdf5e067c777874903d WHIRLPOOL 211e3cb2cc7c1533cdc67e23c93d8dd8eac5753be83599672dc498e06631991e87f7bc02fdf41736367728b32ef5d78034a75f6ff8582c99203a6abdf155abc0 -EBUILD sylpheed-3.1.4-r99.ebuild 1563 SHA256 5c9ffe8705fce690bfffcb2bea0d97082c60a2194da0b120622ccfce71dc7441 SHA512 7ab186b367d705d7d623473539cbfaf9b99419001e759e240fcea7db102d4e4dcec993620673516e17ad8ff012fd155e1c1a531e67304d745cc631ff02b989d4 WHIRLPOOL 8699d330722923f016b0667c8d805040be331ee7ac7ff02f3cfed4a06b94129d1d6f7f9b94a5566f3772e51028136eae423a682aa99008bc9fe5293206a17e93 diff --git a/mail-client/sylpheed/files/sylpheed-3.1.4-menu_key_support.patch b/mail-client/sylpheed/files/sylpheed-3.1.4-menu_key_support.patch deleted file mode 100644 index 077eeef..0000000 --- a/mail-client/sylpheed/files/sylpheed-3.1.4-menu_key_support.patch +++ /dev/null @@ -1,307 +0,0 @@ -diff -ur sylpheed-3.1.4_orig/src/addressbook.c sylpheed-3.1.4/src/addressbook.c ---- sylpheed-3.1.4_orig/src/addressbook.c 2012-10-03 17:25:03.253072293 +0200 -+++ sylpheed-3.1.4/src/addressbook.c 2012-10-03 17:25:41.651355851 +0200 -@@ -201,12 +201,18 @@ - static gboolean addressbook_list_button_released(GtkWidget *widget, - GdkEventButton *event, - gpointer data); -+static gboolean addressbook_list_key_pressed (GtkWidget *widget, -+ GdkEventKey *event, -+ gpointer data); - static gboolean addressbook_tree_button_pressed (GtkWidget *ctree, - GdkEventButton *event, - gpointer data); - static gboolean addressbook_tree_button_released(GtkWidget *ctree, - GdkEventButton *event, - gpointer data); -+static gboolean addressbook_tree_key_pressed (GtkWidget *ctree, -+ GdkEventKey *event, -+ gpointer data); - - static gboolean addressbook_drag_motion (GtkWidget *widget, - GdkDragContext *context, -@@ -718,6 +724,9 @@ - g_signal_connect(G_OBJECT(treeview), "button_release_event", - G_CALLBACK(addressbook_tree_button_released), - NULL); -+ g_signal_connect(G_OBJECT(treeview), "key_press_event", -+ G_CALLBACK(addressbook_tree_key_pressed), -+ NULL); - - gtk_drag_dest_set(treeview, GTK_DEST_DEFAULT_ALL, - addressbook_drag_types, N_DRAG_TYPES, -@@ -843,6 +852,9 @@ - g_signal_connect(G_OBJECT(listview), "button_release_event", - G_CALLBACK(addressbook_list_button_released), - NULL); -+ g_signal_connect(G_OBJECT(listview), "key_press_event", -+ G_CALLBACK(addressbook_list_key_pressed), -+ NULL); - g_signal_connect(G_OBJECT(listview), "row_expanded", - G_CALLBACK(addressbook_person_expand_node), NULL); - g_signal_connect(G_OBJECT(listview), "row_collapsed", -@@ -3721,6 +3733,51 @@ - return FALSE; - } - -+static gboolean addressbook_tree_key_pressed(GtkWidget *widget, -+ GdkEventKey *event, gpointer data) -+{ -+ if (event && event->keyval == GDK_Menu) -+ { -+ GtkTreeView *treeview = GTK_TREE_VIEW(widget); -+ GtkTreeSelection *selection; -+ -+ if (!event) -+ return FALSE; -+ -+ selection = gtk_tree_view_get_selection(treeview); -+ -+ if (selection){ -+ addressbook_menuitem_set_sensitive(); -+ gtk_menu_popup(GTK_MENU(addrbook.tree_popup), NULL, NULL, NULL, -+ NULL, 3, event->time); -+ return TRUE; -+ } -+ } -+ return FALSE; -+} -+ -+static gboolean addressbook_list_key_pressed(GtkWidget *widget, -+ GdkEventKey *event, gpointer data) -+{ -+ if (event && event->keyval == GDK_Menu) -+ { -+ GtkTreeSelection *selection; -+ -+ if (!event) -+ return FALSE; -+ -+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); -+ -+ if (selection){ -+ gtk_menu_popup(GTK_MENU(addrbook.list_popup), NULL, NULL, -+ NULL, NULL, 3, event->time); -+ return TRUE; -+ } -+ } -+ return FALSE; -+} -+ -+ - static void size_allocated(GtkWidget *widget, GtkAllocation *allocation, - gpointer data) - { -diff -ur sylpheed-3.1.4_orig/src/folderview.c sylpheed-3.1.4/src/folderview.c ---- sylpheed-3.1.4_orig/src/folderview.c 2012-10-03 17:25:03.254072301 +0200 -+++ sylpheed-3.1.4/src/folderview.c 2012-10-03 17:25:41.651355851 +0200 -@@ -1639,7 +1639,7 @@ - } - - static gboolean folderview_menu_popup(FolderView *folderview, -- GdkEventButton *event) -+ guint32 event_time) - { - FolderItem *item = NULL; - Folder *folder; -@@ -1663,11 +1663,6 @@ - gboolean search_folder = FALSE; - gboolean folder_property = FALSE; - -- if (!event) return FALSE; -- -- if (event->button != 3) -- return FALSE; -- - if (!gtk_tree_selection_get_selected - (folderview->selection, NULL, &iter)) - return FALSE; -@@ -1861,15 +1856,13 @@ - item->stype != F_VIRTUAL); - SET_VISIBILITY(ifactory, "/Edit search condition...", - item->stype == F_VIRTUAL); -- - #undef SET_SENS - #undef SET_VISIBILITY - #undef SET_VISIBILITY2 - - syl_plugin_signal_emit("folderview-menu-popup", ifactory); - -- gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL, -- event->button, event->time); -+ gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL, 3, event_time); - - return FALSE; - } -@@ -1910,7 +1903,7 @@ - (folderview->selected); - } - gtk_tree_selection_select_path(folderview->selection, path); -- folderview_menu_popup(folderview, event); -+ folderview_menu_popup(folderview, event->time); - gtk_tree_path_free(path); - return TRUE; - } -@@ -2016,6 +2009,16 @@ - } - } - break; -+ case GDK_Menu: -+ if (folderview->selected) { -+ selected = gtk_tree_row_reference_get_path -+ (folderview->selected); -+ gtk_tree_selection_select_path(folderview->selection, selected); -+ folderview_menu_popup(folderview, event->time); -+ gtk_tree_path_free(selected); -+ return TRUE; -+ } -+ break; - default: - break; - } -diff -ur sylpheed-3.1.4_orig/src/mimeview.c sylpheed-3.1.4/src/mimeview.c ---- sylpheed-3.1.4_orig/src/mimeview.c 2012-10-03 17:25:03.255072309 +0200 -+++ sylpheed-3.1.4/src/mimeview.c 2012-10-03 17:25:41.652355859 +0200 -@@ -838,6 +838,51 @@ - } - } - -+static gint mimeview_popup_menu(gint event_button, gint event_time, -+ MimeView *mimeview) -+{ -+ MimeInfo *partinfo; -+ -+ partinfo = mimeview_get_selected_part(mimeview); -+ if (partinfo && (partinfo->mime_type == MIME_TEXT || -+ partinfo->mime_type == MIME_TEXT_HTML || -+ partinfo->mime_type == MIME_MESSAGE_RFC822 || -+ partinfo->mime_type == MIME_IMAGE || -+ partinfo->mime_type == MIME_MULTIPART)) -+ menu_set_sensitive(mimeview->popupfactory, "/Display as text", FALSE); -+ else -+ menu_set_sensitive(mimeview->popupfactory, "/Display as text", TRUE); -+ -+ if (partinfo && partinfo->mime_type == MIME_APPLICATION_OCTET_STREAM) -+ menu_set_sensitive(mimeview->popupfactory, "/Open", FALSE); -+ else -+ menu_set_sensitive(mimeview->popupfactory, "/Open", TRUE); -+ -+ if (partinfo && (partinfo->mime_type == MIME_TEXT || -+ partinfo->mime_type == MIME_TEXT_HTML || -+ partinfo->mime_type == MIME_MESSAGE_RFC822)) -+ menu_set_sensitive(mimeview->popupfactory, "/Print...", TRUE); -+ else -+ menu_set_sensitive(mimeview->popupfactory, "/Print...", FALSE); -+ -+ if (partinfo && partinfo->mime_type == MIME_MESSAGE_RFC822) { -+ gtk_widget_show(mimeview->reply_separator); -+ gtk_widget_show(mimeview->reply_menuitem); -+ } else { -+ gtk_widget_hide(mimeview->reply_separator); -+ gtk_widget_hide(mimeview->reply_menuitem); -+ } -+#if USE_GPGME -+ menu_set_sensitive(mimeview->popupfactory, -+ "/Check signature", -+ mimeview_is_signed(mimeview)); -+#endif -+ -+ gtk_menu_popup(GTK_MENU(mimeview->popupmenu), NULL, NULL, NULL, NULL, -+ event_button, event_time); -+ return TRUE; -+} -+ - static gint mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event, - MimeView *mimeview) - { -@@ -861,51 +906,7 @@ - /* call external program for image, audio or html */ - mimeview_launch(mimeview); - } else if (event->button == 3) { -- partinfo = mimeview_get_selected_part(mimeview); -- if (partinfo && (partinfo->mime_type == MIME_TEXT || -- partinfo->mime_type == MIME_TEXT_HTML || -- partinfo->mime_type == MIME_MESSAGE_RFC822 || -- partinfo->mime_type == MIME_IMAGE || -- partinfo->mime_type == MIME_MULTIPART)) -- menu_set_sensitive(mimeview->popupfactory, -- "/Display as text", FALSE); -- else -- menu_set_sensitive(mimeview->popupfactory, -- "/Display as text", TRUE); -- if (partinfo && -- partinfo->mime_type == MIME_APPLICATION_OCTET_STREAM) -- menu_set_sensitive(mimeview->popupfactory, -- "/Open", FALSE); -- else -- menu_set_sensitive(mimeview->popupfactory, -- "/Open", TRUE); -- -- if (partinfo && (partinfo->mime_type == MIME_TEXT || -- partinfo->mime_type == MIME_TEXT_HTML || -- partinfo->mime_type == MIME_MESSAGE_RFC822)) -- menu_set_sensitive(mimeview->popupfactory, -- "/Print...", TRUE); -- else -- menu_set_sensitive(mimeview->popupfactory, -- "/Print...", FALSE); -- -- if (partinfo && partinfo->mime_type == MIME_MESSAGE_RFC822) { -- gtk_widget_show(mimeview->reply_separator); -- gtk_widget_show(mimeview->reply_menuitem); -- } else { -- gtk_widget_hide(mimeview->reply_separator); -- gtk_widget_hide(mimeview->reply_menuitem); -- } --#if USE_GPGME -- menu_set_sensitive(mimeview->popupfactory, -- "/Check signature", -- mimeview_is_signed(mimeview)); --#endif -- -- gtk_menu_popup(GTK_MENU(mimeview->popupmenu), -- NULL, NULL, NULL, NULL, -- event->button, event->time); -- return TRUE; -+ return mimeview_popup_menu(event->button, event->time, mimeview); - } - - return FALSE; -@@ -981,6 +982,10 @@ - if (summaryview) - summary_pass_key_press_event(summaryview, event); - break; -+ case GDK_Menu: -+ if (summaryview) -+ return mimeview_popup_menu(3, event->time, mimeview); -+ break; - default: - break; - } -diff -ur sylpheed-3.1.4_orig/src/summaryview.c sylpheed-3.1.4/src/summaryview.c ---- sylpheed-3.1.4_orig/src/summaryview.c 2012-10-03 17:25:03.256072316 +0200 -+++ sylpheed-3.1.4/src/summaryview.c 2012-10-03 17:25:41.654355873 +0200 -@@ -5898,6 +5898,7 @@ - return TRUE; - } else if (event->button == 3) { - /* right clicked */ -+ printf("debug dla ubogich\n"); - syl_plugin_signal_emit("summaryview-menu-popup", - summaryview->popupfactory); - gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL, -@@ -5983,6 +5984,13 @@ - case GDK_Escape: - gtk_widget_grab_focus(summaryview->folderview->treeview); - return TRUE; -+ case GDK_Menu: -+ syl_plugin_signal_emit("summaryview-menu-popup", -+ summaryview->popupfactory); -+ gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL, -+ NULL, NULL, 3, event->time); -+ return TRUE; -+ break; - default: - break; - } -Only in sylpheed-3.1.4_orig/src: version.h -Only in sylpheed-3.1.4_orig: sylpheed.spec diff --git a/mail-client/sylpheed/files/sylpheed-r3033.diff b/mail-client/sylpheed/files/sylpheed-r3033.diff deleted file mode 100644 index 1d84628..0000000 --- a/mail-client/sylpheed/files/sylpheed-r3033.diff +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------------------------------------------- -r3033 | hiro | 2012-03-26 16:36:06 +0900 (Mon, 26 Mar 2012) | 1 line - -removed direct inclusion of and (fixes Bug #53). ------------------------------------------------------------------------- -Index: libsylph/defs.h -=================================================================== ---- libsylph/defs.h (revision 3032) -+++ libsylph/defs.h (revision 3033) -@@ -24,12 +24,8 @@ - # include "config.h" - #endif - --#include -+#include - --#ifdef G_OS_WIN32 --# include --#endif -- - #if HAVE_PATHS_H - # include - #endif diff --git a/mail-client/sylpheed/sylpheed-3.1.4-r99.ebuild b/mail-client/sylpheed/sylpheed-3.1.4-r99.ebuild deleted file mode 100644 index f84623d..0000000 --- a/mail-client/sylpheed/sylpheed-3.1.4-r99.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.1.4.ebuild,v 1.9 2012/08/19 15:55:09 armin76 Exp $ - -EAPI="4" - -inherit eutils - -DESCRIPTION="A lightweight email client and newsreader" -HOMEPAGE="http://sylpheed.sraoss.jp/" -SRC_URI="http://sylpheed.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="crypt ipv6 ldap nls oniguruma pda spell ssl xface" - -CDEPEND="x11-libs/gtk+:2 - nls? ( sys-devel/gettext ) - crypt? ( app-crypt/gpgme ) - ldap? ( net-nds/openldap ) - oniguruma? ( dev-libs/oniguruma ) - pda? ( app-pda/jpilot ) - spell? ( app-text/gtkspell:2 ) - ssl? ( dev-libs/openssl )" -RDEPEND="${CDEPEND} - app-misc/mime-types - net-misc/curl" -DEPEND="${CDEPEND} - virtual/pkgconfig - xface? ( media-libs/compface )" - -src_prepare() { - epatch "${FILESDIR}/${PN}-${PV}-menu_key_support.patch" - epatch "${FILESDIR}"/${PN}-r3033.diff -} - -src_configure() { - local htmldir=/usr/share/doc/${PF}/html - econf \ - $(use_enable crypt gpgme) \ - $(use_enable ipv6) \ - $(use_enable ldap) \ - $(use_enable oniguruma) \ - $(use_enable pda jpilot) \ - $(use_enable spell gtkspell) \ - $(use_enable ssl) \ - $(use_enable xface compface) \ - --with-manualdir=${htmldir}/manual \ - --with-faqdir=${htmldir}/faq \ - --disable-updatecheck -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog* NEWS* README* TODO* - - doicon *.png - domenu *.desktop -} diff --git a/media-libs/libmusepack/Manifest b/media-libs/libmusepack/Manifest deleted file mode 100644 index 5f65d94..0000000 --- a/media-libs/libmusepack/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -DIST libmusepack-1.1.tar.bz2 293731 RMD160 54ef101484ff5ddb3324ad44157eb73d8a0c469b SHA1 39cb475bd6c5cb3172a86ea2cdc900553a863e1e SHA256 dc71d69a55d8f237367668d5ebad4d09734e3406fc96f5dd2ac692fc522af32d -EBUILD libmusepack-1.1-r1.ebuild 641 RMD160 b680c43ed4d296c028c6d0dbadc63a6eb803b0d4 SHA1 0e6572058da77500076c14e5a869ce3a7ba62574 SHA256 bdaf1d5583f52156ea61cc5a508d12572f33e0133419394229b2abc2d4fc078b -MD5 051d5b94842242437f1c1940cf1f7af5 libmusepack-1.1-r1.ebuild 641 -RMD160 b680c43ed4d296c028c6d0dbadc63a6eb803b0d4 libmusepack-1.1-r1.ebuild 641 -SHA256 bdaf1d5583f52156ea61cc5a508d12572f33e0133419394229b2abc2d4fc078b libmusepack-1.1-r1.ebuild 641 -MD5 558f0a9fc123af2b6406eb50c5e80ab4 files/digest-libmusepack-1.1-r1 250 -RMD160 0e1891e3b187b143a663b975c185c27985265c82 files/digest-libmusepack-1.1-r1 250 -SHA256 a49dbeda8856e6ff75c85035d9ae78243a467410f16f3c3f9a29503ea1e3f173 files/digest-libmusepack-1.1-r1 250 diff --git a/media-libs/libmusepack/files/digest-libmusepack-1.1-r1 b/media-libs/libmusepack/files/digest-libmusepack-1.1-r1 deleted file mode 100644 index 39d1c84..0000000 --- a/media-libs/libmusepack/files/digest-libmusepack-1.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c06aa1da054ed79989cd71d5300ed7c5 libmusepack-1.1.tar.bz2 293731 -RMD160 54ef101484ff5ddb3324ad44157eb73d8a0c469b libmusepack-1.1.tar.bz2 293731 -SHA256 dc71d69a55d8f237367668d5ebad4d09734e3406fc96f5dd2ac692fc522af32d libmusepack-1.1.tar.bz2 293731 diff --git a/media-libs/libmusepack/libmusepack-1.1-r1.ebuild b/media-libs/libmusepack/libmusepack-1.1-r1.ebuild deleted file mode 100644 index fcf80eb..0000000 --- a/media-libs/libmusepack/libmusepack-1.1-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmusepack/libmusepack-1.1-r1.ebuild,v 1.5 2006/10/28 00:41:48 flameeyes Exp $ - -WANT_AUTOMAKE="latest" -WANT_AUTOCONF="latest" - -inherit autotools - -DESCRIPTION="Musepack decoder library" -HOMEPAGE="http://www.musepack.net" -SRC_URI="http://files.musepack.net/source/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~ppc sparc x86" -IUSE="" - -src_unpack() { - unpack ${A} - cd "${S}" - - eautoreconf -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dodoc README -} diff --git a/media-libs/mac/Manifest b/media-libs/mac/Manifest deleted file mode 100644 index f46d1fd..0000000 --- a/media-libs/mac/Manifest +++ /dev/null @@ -1,16 +0,0 @@ -AUX mac-pointercasting.patch 6285 RMD160 1a07367cf486bc20d1b03a3d7c8244dbcb2a6d93 SHA1 b1ce4586b859f3f70335b8495911c3db126822a5 SHA256 222b472aa468f299fff690022448c1ba873c6128a5bf18a60ec4c754887faa9d -MD5 a17a2029108c23d93bc3b04decc2cce3 files/mac-pointercasting.patch 6285 -RMD160 1a07367cf486bc20d1b03a3d7c8244dbcb2a6d93 files/mac-pointercasting.patch 6285 -SHA256 222b472aa468f299fff690022448c1ba873c6128a5bf18a60ec4c754887faa9d files/mac-pointercasting.patch 6285 -AUX mac-precision.patch 6084 RMD160 af31d1c5d8d610b7badf83020be0185991d7cb0e SHA1 9f29a09466f29433196982e87f8eb8589fc0c710 SHA256 de1360b845637837c6500a4e9acd1279dd510c2f765408fe6878a8f09621eda5 -MD5 5eb76a0457217f4267d8ed29d60ac4fc files/mac-precision.patch 6084 -RMD160 af31d1c5d8d610b7badf83020be0185991d7cb0e files/mac-precision.patch 6084 -SHA256 de1360b845637837c6500a4e9acd1279dd510c2f765408fe6878a8f09621eda5 files/mac-precision.patch 6084 -DIST mac-3.99-u4-b4.tar.gz 435442 RMD160 d0b912bd48ef9a6a60e4f33779a8d9942d4c98fe SHA1 4248340d03ae8cd44a5e37864c197ebff506ffb4 SHA256 707e03533ccf66adbbc5bae1f97d98804882af57fdfee6238320f56a53a6639d -EBUILD mac-3.99.4.4-r1.ebuild 991 RMD160 aa85f33fd8474e938adab4508a906235af156b78 SHA1 f326a100b8fdd5cd750417e5b59fb3692bfc9907 SHA256 4b8ed9df447ad15b45eac1de5e4095d91b5a5b4e9c3481fabe97bb5c9c916918 -MD5 4e3f4460d96abb131f59e0dd02862104 mac-3.99.4.4-r1.ebuild 991 -RMD160 aa85f33fd8474e938adab4508a906235af156b78 mac-3.99.4.4-r1.ebuild 991 -SHA256 4b8ed9df447ad15b45eac1de5e4095d91b5a5b4e9c3481fabe97bb5c9c916918 mac-3.99.4.4-r1.ebuild 991 -MD5 cb4b13f7e0d76e95294a019b69c75faf files/digest-mac-3.99.4.4-r1 244 -RMD160 12de7b7fde377f2235351afc947f9450a22bfe24 files/digest-mac-3.99.4.4-r1 244 -SHA256 3596f931a6813969d59adb7badd4548add72b4edbbb790eab3dec508348abb39 files/digest-mac-3.99.4.4-r1 244 diff --git a/media-libs/mac/files/digest-mac-3.99.4.4-r1 b/media-libs/mac/files/digest-mac-3.99.4.4-r1 deleted file mode 100644 index b58e8aa..0000000 --- a/media-libs/mac/files/digest-mac-3.99.4.4-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7eab2b9cc4bb696452d6c147976294b5 mac-3.99-u4-b4.tar.gz 435442 -RMD160 d0b912bd48ef9a6a60e4f33779a8d9942d4c98fe mac-3.99-u4-b4.tar.gz 435442 -SHA256 707e03533ccf66adbbc5bae1f97d98804882af57fdfee6238320f56a53a6639d mac-3.99-u4-b4.tar.gz 435442 diff --git a/media-libs/mac/files/mac-pointercasting.patch b/media-libs/mac/files/mac-pointercasting.patch deleted file mode 100644 index aeed725..0000000 --- a/media-libs/mac/files/mac-pointercasting.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.cpp mac/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.cpp ---- orig/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.cpp Sun Jul 3 16:31:35 2005 -+++ mac/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.cpp Mon Nov 28 02:05:18 2005 -@@ -23,7 +23,7 @@ - } - - // get format information -- GetInfo(APE_INFO_WAVEFORMATEX, (int) &m_wfeInput); -+ GetInfo(APE_INFO_WAVEFORMATEX, (long) &m_wfeInput); - m_nBlockAlign = GetInfo(APE_INFO_BLOCK_ALIGN); - - // initialize other stuff -@@ -367,7 +367,7 @@ - /***************************************************************************************** - Get information from the decompressor - *****************************************************************************************/ --int CAPEDecompress::GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1, int nParam2) -+int CAPEDecompress::GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1, int nParam2) - { - int nRetVal = 0; - BOOL bHandled = TRUE; -diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.h mac/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.h ---- orig/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.h Thu Mar 10 13:36:25 2005 -+++ mac/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.h Mon Nov 28 02:05:37 2005 -@@ -22,7 +22,7 @@ - int GetData(char * pBuffer, int nBlocks, int * pBlocksRetrieved); - int Seek(int nBlockOffset); - -- int GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1 = 0, int nParam2 = 0); -+ int GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1 = 0, int nParam2 = 0); - - protected: - -diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/APEInfo.cpp mac/work/mac-3.99-u4-b4/src/MACLib/APEInfo.cpp ---- orig/work/mac-3.99-u4-b4/src/MACLib/APEInfo.cpp Mon Nov 28 02:15:38 2005 -+++ mac/work/mac-3.99-u4-b4/src/MACLib/APEInfo.cpp Mon Nov 28 02:13:29 2005 -@@ -129,7 +129,7 @@ - /***************************************************************************************** - Primary query function - *****************************************************************************************/ --int CAPEInfo::GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1, int nParam2) -+int CAPEInfo::GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1, int nParam2) - { - int nRetVal = -1; - -@@ -254,7 +254,7 @@ - } - else - { -- WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (int) &wfeFormat, 0); -+ WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (long) &wfeFormat, 0); - WAVE_HEADER WAVHeader; FillWaveHeader(&WAVHeader, m_APEFileInfo.nWAVDataBytes, &wfeFormat, - m_APEFileInfo.nWAVTerminatingBytes); - memcpy(pBuffer, &WAVHeader, sizeof(WAVE_HEADER)); -diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/APEInfo.h mac/work/mac-3.99-u4-b4/src/MACLib/APEInfo.h ---- orig/work/mac-3.99-u4-b4/src/MACLib/APEInfo.h Thu Mar 10 13:36:25 2005 -+++ mac/work/mac-3.99-u4-b4/src/MACLib/APEInfo.h Mon Nov 28 02:13:35 2005 -@@ -82,7 +82,7 @@ - virtual ~CAPEInfo(); - - // query for information -- int GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1 = 0, int nParam2 = 0); -+ int GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1 = 0, int nParam2 = 0); - - private: - -diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/APESimple.cpp mac/work/mac-3.99-u4-b4/src/MACLib/APESimple.cpp ---- orig/work/mac-3.99-u4-b4/src/MACLib/APESimple.cpp Thu Mar 10 13:36:25 2005 -+++ mac/work/mac-3.99-u4-b4/src/MACLib/APESimple.cpp Mon Nov 28 02:00:57 2005 -@@ -291,7 +291,7 @@ - if (spAPEDecompress == NULL || nFunctionRetVal != ERROR_SUCCESS) throw(nFunctionRetVal); - - // get the input format -- THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (int) &wfeInput)) -+ THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (long) &wfeInput)) - - // allocate space for the header - spTempBuffer.Assign(new unsigned char [spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_BYTES)], TRUE); -diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/MACLib.h mac/work/mac-3.99-u4-b4/src/MACLib/MACLib.h ---- orig/work/mac-3.99-u4-b4/src/MACLib/MACLib.h Tue May 31 10:02:27 2005 -+++ mac/work/mac-3.99-u4-b4/src/MACLib/MACLib.h Mon Nov 28 02:06:30 2005 -@@ -259,7 +259,7 @@ - // int nParam2 - // generic parameter... usage is listed in APE_DECOMPRESS_FIELDS - ////////////////////////////////////////////////////////////////////////////////////////////// -- virtual int GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1 = 0, int nParam2 = 0) = 0; -+ virtual int GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1 = 0, int nParam2 = 0) = 0; - }; - - /************************************************************************************************* -diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.cpp mac/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.cpp ---- orig/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.cpp Fri Mar 11 13:23:37 2005 -+++ mac/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.cpp Mon Nov 28 02:11:44 2005 -@@ -165,7 +165,7 @@ - return ERROR_SUCCESS; - } - --int CAPEDecompressOld::GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1, int nParam2) -+int CAPEDecompressOld::GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1, int nParam2) - { - int nRetVal = 0; - BOOL bHandled = TRUE; -diff -ru --exclude Makefile --exclude *.Plo orig/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.h mac/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.h ---- orig/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.h Thu Mar 10 13:36:26 2005 -+++ mac/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.h Mon Nov 28 02:11:54 2005 -@@ -13,7 +13,7 @@ - int GetData(char * pBuffer, int nBlocks, int * pBlocksRetrieved); - int Seek(int nBlockOffset); - -- int GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1 = 0, int nParam2 = 0); -+ int GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1 = 0, int nParam2 = 0); - - protected: - diff --git a/media-libs/mac/files/mac-precision.patch b/media-libs/mac/files/mac-precision.patch deleted file mode 100644 index 3b61a1d..0000000 --- a/media-libs/mac/files/mac-precision.patch +++ /dev/null @@ -1,115 +0,0 @@ ---- mac-3.99-u4-b4/src/MACLib/APESimple.cpp.old 2005-11-28 11:10:22.000000000 -0800 -+++ mac-3.99-u4-b4/src/MACLib/APESimple.cpp 2005-11-28 11:12:04.000000000 -0800 -@@ -298,7 +298,7 @@ - if (spTempBuffer == NULL) throw(ERROR_INSUFFICIENT_MEMORY); - - // get the header -- THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_DATA, (int) spTempBuffer.GetPtr(), spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_BYTES))); -+ THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_DATA, (long) spTempBuffer.GetPtr(), spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_BYTES))); - - // initialize the output - if (nOutputMode == UNMAC_DECODER_OUTPUT_WAV) -@@ -370,7 +370,7 @@ - { - spTempBuffer.Assign(new unsigned char[spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES)], TRUE); - if (spTempBuffer == NULL) throw(ERROR_INSUFFICIENT_MEMORY); -- THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_DATA, (int) spTempBuffer.GetPtr(), spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES))) -+ THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_DATA, (long) spTempBuffer.GetPtr(), spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES))) - - unsigned int nBytesToWrite = spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES); - unsigned int nBytesWritten = 0; -@@ -392,7 +392,7 @@ - spTempBuffer.Assign(new unsigned char[nTerminatingBytes], TRUE); - if (spTempBuffer == NULL) throw(ERROR_INSUFFICIENT_MEMORY); - -- THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_DATA, (int) spTempBuffer.GetPtr(), nTerminatingBytes)) -+ THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_DATA, (long) spTempBuffer.GetPtr(), nTerminatingBytes)) - - if (bHasTag) - { ---- mac-3.99-u4-b4/src/MACLib/APEInfo.cpp.old 2005-11-28 11:09:13.000000000 -0800 -+++ mac-3.99-u4-b4/src/MACLib/APEInfo.cpp 2005-11-28 11:09:51.000000000 -0800 -@@ -311,7 +311,7 @@ - break; - } - case APE_INFO_IO_SOURCE: -- nRetVal = (int) m_spIO.GetPtr(); -+ nRetVal = (long) m_spIO.GetPtr(); - break; - case APE_INFO_FRAME_BYTES: - { -@@ -350,10 +350,10 @@ - break; - } - case APE_INFO_TAG: -- nRetVal = (int) m_spAPETag.GetPtr(); -+ nRetVal = (long) m_spAPETag.GetPtr(); - break; - case APE_INTERNAL_INFO: -- nRetVal = (int) &m_APEFileInfo; -+ nRetVal = (long) &m_APEFileInfo; - break; - default: - break; ---- mac-3.99-u4-b4/src/MACLib/APEDecompress.cpp.old 2005-11-28 11:08:03.000000000 -0800 -+++ mac-3.99-u4-b4/src/MACLib/APEDecompress.cpp 2005-11-28 11:08:32.000000000 -0800 -@@ -452,7 +452,7 @@ - } - else - { -- WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (int) &wfeFormat, 0); -+ WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (long) &wfeFormat, 0); - WAVE_HEADER WAVHeader; FillWaveHeader(&WAVHeader, - (m_nFinishBlock - m_nStartBlock) * GetInfo(APE_INFO_BLOCK_ALIGN), - &wfeFormat, 0); ---- mac-3.99-u4-b4/src/MACLib/MD5.cpp.old 2005-11-28 11:12:35.000000000 -0800 -+++ mac-3.99-u4-b4/src/MACLib/MD5.cpp 2005-11-28 11:13:10.000000000 -0800 -@@ -100,7 +100,7 @@ - CopyToLittleEndian (tempBuffer, in, 16); - x = tempBuffer; - #else -- if ( (unsigned int)in & 3 ) { -+ if ( (unsigned long)in & 3 ) { - memcpy ( tempBuffer, in, 64 ); - x = tempBuffer; - } ---- mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.cpp.old 2005-11-28 11:05:19.000000000 -0800 -+++ mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.cpp 2005-11-28 11:05:37.000000000 -0800 -@@ -250,7 +250,7 @@ - } - else - { -- WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (int) &wfeFormat, 0); -+ WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (long) &wfeFormat, 0); - WAVE_HEADER WAVHeader; FillWaveHeader(&WAVHeader, - (m_nFinishBlock - m_nStartBlock) * GetInfo(APE_INFO_BLOCK_ALIGN), - &wfeFormat, 0); ---- mac-3.99-u4-b4/src/MACLib/Old/UnMAC.cpp.old 2005-11-28 11:06:57.000000000 -0800 -+++ mac-3.99-u4-b4/src/MACLib/Old/UnMAC.cpp 2005-11-28 11:07:23.000000000 -0800 -@@ -78,7 +78,7 @@ - // set the initialized flag to TRUE - m_bInitialized = TRUE; - -- m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (int) &m_wfeInput); -+ m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (long) &m_wfeInput); - - // return a successful value - return ERROR_SUCCESS; -@@ -197,7 +197,7 @@ - { - m_pAPEDecompressCore->GenerateDecodedArrays(nBlocks, nSpecialCodes, FrameIndex, CPULoadBalancingFactor); - -- WAVEFORMATEX WaveFormatEx; m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (int) &WaveFormatEx); -+ WAVEFORMATEX WaveFormatEx; m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (long) &WaveFormatEx); - m_pPrepare->UnprepareOld(m_pAPEDecompressCore->GetDataX(), m_pAPEDecompressCore->GetDataY(), nBlocks, &WaveFormatEx, - pOutputData, (unsigned int *) &CRC, (int *) &nSpecialCodes, m_pAPEDecompress->GetInfo(APE_INFO_FILE_VERSION)); - } -@@ -205,7 +205,7 @@ - { - m_pAPEDecompressCore->GenerateDecodedArrays(nBlocks, nSpecialCodes, FrameIndex, CPULoadBalancingFactor); - -- WAVEFORMATEX WaveFormatEx; m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (int) &WaveFormatEx); -+ WAVEFORMATEX WaveFormatEx; m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (long) &WaveFormatEx); - m_pPrepare->UnprepareOld(m_pAPEDecompressCore->GetDataX(), NULL, nBlocks, &WaveFormatEx, - pOutputData, (unsigned int *) &CRC, (int *) &nSpecialCodes, m_pAPEDecompress->GetInfo(APE_INFO_FILE_VERSION)); - } diff --git a/media-libs/mac/mac-3.99.4.4-r1.ebuild b/media-libs/mac/mac-3.99.4.4-r1.ebuild deleted file mode 100644 index 151897c..0000000 --- a/media-libs/mac/mac-3.99.4.4-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: - -inherit eutils versionator - -MY_P="${PN}-$(get_version_component_range 1-2)" -MY_P="${MY_P}-u$(get_version_component_range 3)" -MY_P="${MY_P}-b$(get_version_component_range 4)" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="unix port of Monkey's Audio" -HOMEPAGE="http://sourceforge.net/projects/mac-port" -SRC_URI="mirror://sourceforge/mac-port/${MY_P}.tar.gz" - -LICENSE="unknown" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="backward-compatible" - -DEPEND="virtual/libc - x86? ( dev-lang/nasm )" - -src_compile() { - epatch ${FILESDIR}/mac-precision.patch || die - epatch ${FILESDIR}/mac-pointercasting.patch || die - - econf `use_enable backward-compatible backward` || die "configure failed" - emake || die "make failed" -} - -src_install() { - make DESTDIR=${D} install || die "make install failed" - dodoc AUTHORS INSTALL NEWS README TODO COPYING - dohtml ${S}/src/License.htm ${S}/src/Readme.htm -} diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest deleted file mode 100644 index c71fa8b..0000000 --- a/media-sound/exaile/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST exaile_0.2.14.tar.gz 1527168 RMD160 04919b4109a50e3e93d14492f3810694e6a07c4d SHA1 3442867ae6f5116f87eb2488da73cf6d23442f52 SHA256 04271a8040b18706a20312ecc911f4ffd2258272d04d8ba1eef36a3f301a074a -EBUILD exaile-0.2.14-r10.ebuild 2571 RMD160 0270e93f67d94796f6bb49cee36f41798f4befe0 SHA1 4708899cf113403b075ed4fc8d714e77f4462e8c SHA256 1f8297f2b78911f2959ec6f3e30d1dbf1197e2d637419240bc6c42a79d2205b5 diff --git a/media-sound/exaile/exaile-0.2.14-r10.ebuild b/media-sound/exaile/exaile-0.2.14-r10.ebuild deleted file mode 100644 index ee77a3e..0000000 --- a/media-sound/exaile/exaile-0.2.14-r10.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.14.ebuild,v 1.1 2008/10/28 06:58:25 aballier Exp $ - -inherit eutils fdo-mime multilib python - -GVER=0.10 - -MY_P=${PN}_${PV} - -DESCRIPTION="a media player aiming to be similar to AmaroK, but for GTK+" -HOMEPAGE="http://www.exaile.org" -SRC_URI="http://www.exaile.org/files/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc x86" -IUSE="aac alsa cdparanoia equalizer flac gnome ipod +jpeg libnotify +libsexy - mad musepack nls ogg oss +png vorbis" - -RDEPEND="dev-python/dbus-python - >=media-libs/mutagen-1.12 - >=dev-python/pygtk-2.10 - || ( >=dev-lang/python-2.5 dev-python/elementtree ) - libnotify? ( dev-python/notify-python ) - libsexy? ( dev-python/sexy-python ) - gnome? ( >=dev-python/gnome-python-extras-2.14 - >=media-plugins/gst-plugins-gconf-${GVER} - >=media-plugins/gst-plugins-gnomevfs-${GVER} ) - >=media-libs/gst-plugins-good-${GVER} - equalizer? ( >=media-libs/gst-plugins-bad-0.10.5 ) - >=dev-python/gst-python-0.10.9 - musepack? ( >=media-plugins/gst-plugins-musepack-${GVER} ) - vorbis? ( >=media-plugins/gst-plugins-vorbis-${GVER} ) - flac? ( >=media-plugins/gst-plugins-flac-${GVER} ) - aac? ( >=media-plugins/gst-plugins-faad-${GVER} ) - alsa? ( >=media-plugins/gst-plugins-alsa-${GVER} ) - oss? ( >=media-plugins/gst-plugins-oss-${GVER} ) - mad? ( >=media-plugins/gst-plugins-mad-${GVER} ) - ogg? ( >=media-plugins/gst-plugins-ogg-${GVER} ) - cdparanoia? ( >=media-plugins/gst-plugins-cdparanoia-${GVER} - dev-python/cddb-py ) - ipod? ( >=media-libs/libgpod-0.4[python] - >=media-plugins/gst-plugins-faad-${GVER} ) - jpeg? ( >=media-plugins/gst-plugins-jpeg-${GVER} ) - png? ( >=media-plugins/gst-plugins-libpng-${GVER} )" -DEPEND="nls? ( dev-util/intltool sys-devel/gettext )" - -src_compile() { - emake mmkeys.so || die "emake mmkeys.so failed." - - if use nls; then - emake translations || die "emake translations failed." - fi -} - -src_install() { - emake PREFIX="/usr" LIBDIR="/$(get_libdir)" DESTDIR="${D}" install || die "emake install failed." - newdoc changelog ChangeLog -} - -pkg_postinst() { - python_mod_optimize /usr/$(get_libdir)/${PN} - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - elog "You need media-plugins/gst-plugins-gnomevfs for streaming, but you may also try" - elog "media-plugins/gst-plugins-neon to avoid installing gnome." -} - -pkg_postrm() { - python_mod_cleanup /usr/$(get_libdir)/${PN} - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} diff --git a/media-video/realplayer/ChangeLog b/media-video/realplayer/ChangeLog deleted file mode 100644 index 24dfdff..0000000 --- a/media-video/realplayer/ChangeLog +++ /dev/null @@ -1,337 +0,0 @@ -# ChangeLog for media-video/realplayer -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/realplayer/ChangeLog,v 1.76 2008/10/29 17:32:24 beandog Exp $ - -*realplayer-11.0.1.1056-r2 (29 Oct 2008) - - 29 Oct 2008; Steve Dibb - -realplayer-11.0.1.1056-r1.ebuild, +realplayer-11.0.1.1056-r2.ebuild: - Final cleanup of realplayer and codecs: codecs in realcodecs package, X11 - player in this package, dropped X use flag, reverted to unstable because - of security issues, bug 240341 - -*realplayer-11.0.1.1056-r1 (29 Oct 2008) - - 29 Oct 2008; Steve Dibb - -realplayer-11.0.1.1056.ebuild, +realplayer-11.0.1.1056-r1.ebuild: - Drop EAPI2, bug 244861 - -*realplayer-11.0.1.1056 (28 Oct 2008) - - 28 Oct 2008; Steve Dibb -files/10realplayer, - +files/realplayer-desktop.patch, -realplayer-11.0.0.4028-r1.ebuild, - +realplayer-11.0.1.1056.ebuild: - Version bump / manifest fix / evil straight to stable bump because of - upstream (hopefully last time), bug 239338; fix desktop entry, bug 236257 - - 15 Aug 2008; Markus Meier - realplayer-11.0.0.4028-r1.ebuild: - amd64/x86 stable, bug #232997 - - 11 Aug 2008; Matthias Schwarzott - realplayer-11.0.0.4028-r1.ebuild: - Merge both RESTRICT settings into one, else restriction of mirroring got - ignored. - - 09 Aug 2008; Matthias Schwarzott - realplayer-11.0.0.4028-r1.ebuild: - Also ignore QA warning about not respecting LDFLAGS to set hash type, - thanks to arfrever for that idea. - - 08 Aug 2008; Matthias Schwarzott - realplayer-11.0.0.4028-r1.ebuild: - Remove the exec-stack QA warning, as we cannot do anything for binary-only - files. - -*realplayer-11.0.0.4028-r1 (08 Aug 2008) - - 08 Aug 2008; Matthias Schwarzott - -realplayer-11.0.0.4028.ebuild, +realplayer-11.0.0.4028-r1.ebuild: - Make executable files really executable, Bug #233415. - - 29 Jul 2008; Steve Dibb - realplayer-11.0.0.4028.ebuild: - Add mirror restriction - -*realplayer-11.0.0.4028 (01 Jun 2008) - - 01 Jun 2008; Steve Dibb - +realplayer-11.0.0.4028.ebuild: - Version bump, bug 217429 - - 27 Nov 2007; Matthias Schwarzott - realplayer-10.0.9.ebuild: - Fixed quoting. - - 28 Aug 2007; Jurek Bartuszek realplayer-10.0.9.ebuild: - x86 stable (bug #183421) - -*realplayer-10.0.9 (25 Aug 2007) - - 25 Aug 2007; Steve Dibb +realplayer-10.0.9.ebuild: - Security bump, bug 183421 - - 02 Jul 2007; Piotr JaroszyÅ„ski - realplayer-10.0.8.ebuild, realplayer-10.0.8-r1.ebuild, - realplayer-10.0.8-r2.ebuild: - (QA) RESTRICT clean up. - - 18 Apr 2007; Steve Dibb realplayer-10.0.8.ebuild, - realplayer-10.0.8-r1.ebuild, realplayer-10.0.8-r2.ebuild: - Fix download url, bug 172068 - -*realplayer-10.0.8-r2 (18 Feb 2007) - - 18 Feb 2007; Steve Dibb +realplayer-10.0.8-r2.ebuild: - Cleanup RESTRICT (strip, test), add more documentation, create symlinks of - some codecs for mplayer-bin to find them correctly - - 14 Feb 2007; Steve Dibb realplayer-10.0.8-r1.ebuild: - Fix language resources install, bug 164992 - - 05 Feb 2007; Christian Faulhammer - realplayer-10.0.8-r1.ebuild: - stable x86; bug #164992 - -*realplayer-10.0.8-r1 (08 Jan 2007) - - 08 Jan 2007; Steve Dibb metadata.xml, - -realplayer-10.0.7.ebuild, realplayer-10.0.8.ebuild, - +realplayer-10.0.8-r1.ebuild: - Remove old version, cleanup ebuilds, add optional X use flag in new ebuild - - 14 Dec 2006; Peter Weller realplayer-10.0.8.ebuild: - Added amd64 keyword wrt bug #158041 - - 14 Dec 2006; Christian Faulhammer - realplayer-10.0.8.ebuild: - stable x86, bug #158041 - - 13 Dec 2006; Steve Dibb realplayer-10.0.7.ebuild, - realplayer-10.0.8.ebuild: - Install nphelix.xpt, bug 153610 - - 02 Oct 2006; Diego Pettenò - realplayer-10.0.7.ebuild, realplayer-10.0.8.ebuild: - Elicit presence of textrels in shared objects. Thanks to Jakub Moc in bug - #148761. - -*realplayer-10.0.8 (22 Sep 2006) - - 22 Sep 2006; Steve Dibb +realplayer-10.0.8.ebuild: - Version bump - - 21 Jul 2006; Diego Pettenò - realplayer-10.0.7.ebuild: - Add needed libstdc++-v3 dependency as per bug #108773. - - 28 May 2006; Diego Pettenò - -realplayer-10.0.6.ebuild: - Remove vulnerable version. - - 03 May 2006; Diego Pettenò metadata.xml: - Update metadata to list media-video@gentoo.org as maintainer. - - 28 Apr 2006; Marien Zwart - files/digest-realplayer-10.0.6, Manifest: - Fixing SHA256 digest, pass four - -*realplayer-10.0.7 (23 Mar 2006) - - 23 Mar 2006; Diego Pettenò - +realplayer-10.0.7.ebuild: - Version bump. - - 20 Nov 2005; Diego Pettenò -files/mimeinfo, - -files/realplayer.desktop, -realplayer-8-r6.ebuild, - -realplayer-8-r7.ebuild, -realplayer-10.0.2.ebuild, - -realplayer-10.0.3.ebuild, -realplayer-10.0.3-r1.ebuild, - -realplayer-10.0.4.ebuild, -realplayer-10.0.5.ebuild: - Remove old versions. - - 07 Oct 2005; Simon Stelling realplayer-10.0.6.ebuild: - stable on amd64 wrt bug 107309 - - 04 Oct 2005; Paul Varner realplayer-10.0.6.ebuild: - stable on x86. Bug# 107309 - - 02 Oct 2005; Marc Hildebrand realplayer-10.0.6.ebuild: - Version bump. - - 25 Sep 2005; Carsten Lohrke realplayer-10.0.5.ebuild: - Fixed url. - - 11 Aug 2005; Diego Pettenò - realplayer-10.0.3.ebuild, realplayer-10.0.3-r1.ebuild, - realplayer-10.0.4.ebuild, realplayer-10.0.5.ebuild: - Call has_multilib_profile from pkg_setup instead of global scope. - - 12 Jul 2005; Diego Pettenò - realplayer-10.0.2.ebuild, realplayer-10.0.3.ebuild, - realplayer-10.0.3-r1.ebuild, realplayer-10.0.4.ebuild, - realplayer-10.0.5.ebuild: - Rename mozilla useflag into nsplugin. - - 11 Jul 2005; Herbie Hopkins realplayer-10.0.5.ebuild: - Stable on amd64 wrt bug #89951. - - 06 Jul 2005; realplayer-10.0.5.ebuild: - Stable on x86, bug #96923. - -*realplayer-10.0.5 (24 Jun 2005) - - 24 Jun 2005; Diego Pettenò - +realplayer-10.0.5.ebuild: - New upstream version, fixes installation of icons to hicolor theme. - - 26 May 2005; Sven Wegener metadata.xml: - Herd name is 'video' not 'media-video' - - 21 Apr 2005; Olivier Crête realplayer-10.0.4.ebuild: - Stable on x86 per security bug #89862 - -*realplayer-10.0.4 (21 Apr 2005) - - 21 Apr 2005; Diego Pettenò - +realplayer-10.0.4.ebuild: - Added new upstream version. - - 11 Apr 2005; Jan Brinkmann metadata.xml, - realplayer-10.0.2.ebuild, realplayer-10.0.3-r1.ebuild, - realplayer-10.0.3.ebuild: - updated maintainer information in metadata.xml according to comment #1 in bug - #86285, chriswhite is retired. also fixed the depend. - - 29 Mar 2005; Jan Brinkmann realplayer-10.0.3.ebuild: - digest fixes - -*realplayer-10.0.3-r1 (29 Mar 2005) - - 29 Mar 2005; Jan Brinkmann - +realplayer-10.0.3-r1.ebuild: - corrected src_uri, fixes #86564 - - 19 Mar 2005; Jan Brinkmann realplayer-10.0.3.ebuild: - added ~amd64 to KEYWORDS, fixes #85080 - - 15 Mar 2005; Chris White realplayer-10.0.3.ebuild: - Fixed bug #85246. - -*realplayer-10.0.3 (13 Mar 2005) - - 13 Mar 2005; Chris White +realplayer-10.0.3.ebuild: - Fixing bug #40469, which also fixes an (unreported?) security bug. Stable on - x86. - - 08 Feb 2005; Chris White realplayer-10.0.2.ebuild: - Fixing all the 'bump realplayer' bugs. Also added the language pack logic. - -*realplayer-10.0.2 (09 Jan 2005) - - 09 Jan 2005; Chris White +realplayer-10.0.2.ebuild: - Putting this out finally. This fixes so many bugs and forum posts, I'm not - going to list them all :). - - 01 Jul 2004; Jeremy Huddleston - realplayer-8-r6.ebuild, realplayer-8-r7.ebuild: - virtual/glibc -> virtual/libc - - 15 Mar 2004; Seemant Kulleen realplayer-8-r5.ebuild: - remove -r5 as it was unstable on all arches, which -r7 will be, plus it - violated bug 44712 by Michael Sterret - - 28 Feb 2004; Alastair Tse realplayer-8-r7.ebuild: - add mention about artsdsp (#30699) - - 17 Jan 2004; Bartosch Pixa realplayer-8-r6.ebuild: - manifest fix - - 16 Jan 2004; Bartosch Pixa realplayer-8-r6.ebuild: - set ppc in keywords - -*realplayer-8-r7 (02 Nov 2003) - - 02 Nov 2003; Alastair Tse realplayer-8-r6.ebuild, - realplayer-8-r7.ebuild: - split rv9 codecs to media-plugins/realvideo-codecs, switched to pkg_nofetch() - and cleaned up src_unpack() - - 09 Sep 2003; Alastair Tse realplayer-8-r2.ebuild, - realplayer-8-r3.ebuild, realplayer-8-r4.ebuild, realplayer-8-r6.ebuild: - cleanup and bumping -r6 to stable x86 - - 07 Sep 2003; Jason Wever realplayer-8-r6.ebuild: - Added fix for bug #15314. - - 05 Sep 2003; Alastair Tse realplayer-8-r6.ebuild: - un-redefine ${A} - -*realplayer-8-r6 (19 Jul 2003) - - 19 Jul 2003; lanius@gentoo.org realplayer-8-r6.ebuild: - fixed bug #24801 use /usr/share/applnk instead of ${KDEDIR/share/applnnk to - remove dep on kde-env - - 13 Jul 2003; Seemant Kulleen realplayer-8-r5.ebuild: - CJ Kucera's patch to add the digests for the different realplayers. See - bug #24391. - -*realplayer-8-r5 (09 Feb 2003) - - 16 Mar 2003; Alastair Tse realplayer-8-r5.ebuild, - files/realplayer.desktop: - tested and gnome2-ified menu entry. changed pixmap installation dir - and fixed icon in menu entry. - - 09 Feb 2003; Seemant Kulleen realplayer-8-r5.ebuild - files/digest-realplayer-8-r5 : - - Inherits kde eclass so that kde menu entries go into the right place, and - also fixes for gnome menu entries (needs a bit of verification). Thanks - to: Matt Caesar and Alastair Tse - in bug #15295 - -*realplayer-8-r4 (08 Jan 2003) - - 14 Jan 2003; Martin Holzer realplayer-8-r4.ebuild : - Latest update, this should fix all problems. - - 12 Jan 2003; Seemant Kulleen realplayer-8-r4.ebuild : - - Removed ${MY_P} from SRC_URI, so the ebuild doesn't break after it tries - to fetch the fetch restricted stuffs. Thanks to: moixa@gmx.ch in bug #10066. - - 12 Jan 2003; Martin Holzer realplayer-8-r4.ebuild : - Fixed script, now display's how it should do - - 08 Jan 2003; Seemant Kulleen realplayer-8-r4.ebuild - files/realplayer.desktop files/mimeinfo files/digest-realplayer-8-r4 : - - This is a new multi-architecture capable ebuild. Currently, it will - install for ppc, sparc, alpha and x86 . This ebuild - courtesy of the brilliance of: danny@ricin.com (Danny Pansters) in bug - #10066 - -*realplayer-8-r3 (21 Nov 2002) - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - - 21 Nov 2002; phoen][x realplayer-8-r3.ebuild, - files/digest-realplayer-8-r3 : - Switched to the new nsplugins layout. - -*realplayer-8-r2 (2 Mar 2002) - - 2 Mar 2002; William McArthur realplayer-8-r2.ebuild : - Updated ebuild for Mozilla and added LICENSE. I also changed the files in - /opt/netscape/plugins/* to be symlinks. - -*realplayer-8-r1 (1 Feb 2002) - - 1 Feb 2002; G.Bevin ChangeLog : - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/media-video/realplayer/Manifest b/media-video/realplayer/Manifest deleted file mode 100644 index cbbf0e1..0000000 --- a/media-video/realplayer/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX realplayer-desktop.patch 2982 RMD160 057546f189191db5127e8f5ca9af7a7bb40e1555 SHA1 433a00c9b17258bf6a69b3f23690d998259e1655 SHA256 219f511ac19d2adb2cc5b5a374b4bd15a95bea032d1d43cd6ae91529bc7a3de7 -DIST RealPlayer11GOLD.rpm 8767186 RMD160 1362fb9d45a5c420698d68450121d32f43f553f1 SHA1 0180bc7f9c22ee9d561598fdffc9168d56c7a4f4 SHA256 245e7bda7814cbf7529ec45c14a64e6289ce05ebc2b55727ba0805d6edcc8a32 -EBUILD realplayer-11.0.1.1056-r2.ebuild 3264 RMD160 a5ab455e5b6d5e8b99177701d2a41360e4012955 SHA1 07b0d6e523ce24c0efb2115770724c6d9038ffff SHA256 42754841cd3e9413d3e0b35e4532dcebcde2a9d91e818495137526321b999a31 -MISC ChangeLog 12316 RMD160 53809e8f8048f011fd8b4b252e806e6793add72f SHA1 723896c7d22d47ba23b321a17e4183d942ba7295 SHA256 114609d1a3716e4695eb9c9302641e494c59757542b35fff613217756ee047d0 -MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 diff --git a/media-video/realplayer/files/realplayer-desktop.patch b/media-video/realplayer/files/realplayer-desktop.patch deleted file mode 100644 index 24759cb..0000000 --- a/media-video/realplayer/files/realplayer-desktop.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- share/realplay.desktop~ 2008-08-31 11:23:37.000000000 +0200 -+++ share/realplay.desktop 2008-08-31 11:23:37.000000000 +0200 -@@ -13,8 +13,7 @@ - GenericName=Media Player - Exec=realplay %U - Type=Application --Encoding=UTF-8 - Icon=realplay --Categories=GNOME;Application;AudioVideo;Audio;Video;Player --MimeType=application/x-ogg;application/ogg;audio/x-vorbis+ogg;video/x-theora+ogg;audio/mp3;audio/x-mp3;audio/mpeg;audio/mpg;audio/x-mpeg;audio/x-mpg;audio/mpegurl;audio/wav;audio/x-wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-pn-windows-pcm;text/vnd.rn-realtext;application/vnd.rn-realmedia-secure;application/vnd.rn-realaudio-secure;audio/x-realaudio-secure;video/vnd.rn-realvideo-secure;audio/vnd.rn-realaudio;audio/x-realaudio;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;image/vnd.rn-realpix;audio/x-pn-realaudio;video/vnd.rn-realvideo;application/vnd.rn-realsystem-rmj;application/vnd.rn-realsystem-rmx;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp4;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/x-mpegurl;application/smil;application/x-smil;application/smil+xml;application/streamingmedia;application/x-streamingmedia;application/sdp;audio/basic;audio/x-pn-au;audio/aiff;audio/x-aiff;audio/x-pn-aiff;video/3gpp;video/3gpp-encrypted;audio/3gpp;audio/3gpp-encrypted;audio/amr;audio/amr-encrypted;audio/amr-wb;audio/amr-wb-encrypted;audio/x-rn-3gpp-amr;audio/x-rn-3gpp-amr-encrypted;audio/x-rn-3gpp-amr-wb;audio/x-rn-3gpp-amr-wb-encrypted;video/3gpp2;audio/3gpp2;video/x-real-video;video/mpeg4-generic;video/x-ms-asf;audio/x-ms-wma;video/x-ms-wmv;application/vnd.rn-wma;application/vnd.rn-wmv -+Categories=GNOME;AudioVideo;Audio;Video;Player; -+MimeType=application/x-ogg;application/ogg;audio/x-vorbis+ogg;video/x-theora+ogg;audio/mp3;audio/x-mp3;audio/mpeg;audio/mpg;audio/x-mpeg;audio/x-mpg;audio/mpegurl;audio/wav;audio/x-wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-pn-windows-pcm;text/vnd.rn-realtext;application/vnd.rn-realmedia-secure;application/vnd.rn-realaudio-secure;audio/x-realaudio-secure;video/vnd.rn-realvideo-secure;audio/vnd.rn-realaudio;audio/x-realaudio;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;image/vnd.rn-realpix;audio/x-pn-realaudio;video/vnd.rn-realvideo;application/vnd.rn-realsystem-rmj;application/vnd.rn-realsystem-rmx;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp4;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/x-mpegurl;application/smil;application/x-smil;application/smil+xml;application/streamingmedia;application/x-streamingmedia;application/sdp;audio/basic;audio/x-pn-au;audio/aiff;audio/x-aiff;audio/x-pn-aiff;video/3gpp;video/3gpp-encrypted;audio/3gpp;audio/3gpp-encrypted;audio/amr;audio/amr-encrypted;audio/amr-wb;audio/amr-wb-encrypted;audio/x-rn-3gpp-amr;audio/x-rn-3gpp-amr-encrypted;audio/x-rn-3gpp-amr-wb;audio/x-rn-3gpp-amr-wb-encrypted;video/3gpp2;audio/3gpp2;video/x-real-video;video/mpeg4-generic;video/x-ms-asf;audio/x-ms-wma;video/x-ms-wmv;application/vnd.rn-wma;application/vnd.rn-wmv; - diff --git a/media-video/realplayer/metadata.xml b/media-video/realplayer/metadata.xml deleted file mode 100644 index edccfe5..0000000 --- a/media-video/realplayer/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - -video - -media-video@gentoo.org - - diff --git a/media-video/realplayer/realplayer-11.0.1.1056-r2.ebuild b/media-video/realplayer/realplayer-11.0.1.1056-r2.ebuild deleted file mode 100644 index 0db2520..0000000 --- a/media-video/realplayer/realplayer-11.0.1.1056-r2.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/realplayer/realplayer-11.0.1.1056-r2.ebuild,v 1.1 2008/10/29 17:32:24 beandog Exp $ - -inherit nsplugins eutils rpm - -MY_PN="RealPlayer" -DESCRIPTION="Real Media Player" -HOMEPAGE="http://www.real.com/ http://player.helixcommunity.org/" -SRC_URI="http://forms.real.com/real/player/download.html?f=unix/RealPlayer11GOLD.rpm" -RESTRICT="mirror strip test" -LICENSE="HBRL" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="nsplugin" -RDEPEND="=media-libs/realcodecs-${PV}* - x86? ( - >=dev-libs/glib-2 - >=x11-libs/pango-1.2 - >=x11-libs/gtk+-2.2 - =virtual/libstdc++-3.3* - ) - amd64? ( - app-emulation/emul-linux-x86-gtklibs - app-emulation/emul-linux-x86-compat - )" - -QA_TEXTRELS="opt/RealPlayer/codecs/raac.so - opt/RealPlayer/codecs/colorcvt.so - opt/RealPlayer/codecs/drv2.so - opt/RealPlayer/codecs/drvc.so - opt/RealPlayer/plugins/theorarend.so - opt/RealPlayer/plugins/vorbisrend.so - opt/RealPlayer/plugins/swfrender.so - opt/RealPlayer/plugins/oggfformat.so" - -QA_EXECSTACK="opt/RealPlayer/plugins/swfrender.so - opt/RealPlayer/plugins/vidsite.so - opt/RealPlayer/codecs/raac.so - opt/RealPlayer/codecs/drvc.so - opt/RealPlayer/codecs/drv2.so - opt/RealPlayer/codecs/colorcvt.so - opt/RealPlayer/codecs/atrc.so" - -QA_DT_HASH="opt/.*so opt/.*/realplay.bin" - -S="${WORKDIR}/opt/real/${MY_PN}" - -pkg_nofetch() { - einfo "Download RealPlayer manually from Real's website at" - einfo ${HOMEPAGE} - einfo "" - einfo "Choose Linux/x86 Releases: RealPlayer 10.0.9 Gold: RPM" - einfo "https://helixcommunity.org/projects/player/files/download/2479" - einfo "" - einfo "Then place the file ${SRC_URI}" - einfo "into ${DISTDIR} and restart the emerge." -} - -pkg_setup() { - # This is a binary x86 package => ABI=x86 - # Please keep this in future versions - # Danny van Dyk 2005/03/26 - has_multilib_profile && ABI="x86" -} - -src_unpack() { - rpm_src_unpack - - cd "${S}" - epatch "${FILESDIR}"/${PN}-desktop.patch -} - -src_install() { - dodir /opt/${MY_PN} - - cd "${S}" - - rm "${S}/share/distcode" - - # Make them executable, Bug #233415 - exeinto "/opt/${MY_PN}/" - doexe realplay realplay.bin - - insinto "/opt/${MY_PN}/" - for x in common mozilla plugins share; do - doins -r "${S}/${x}" - done; - - domenu "${S}/share/realplay.desktop" - - for res in 16 32 48 192; do - insinto /usr/share/icons/hicolor/${res}x${res}/apps - newins "${S}/share/icons/realplay_${res}x${res}.png" \ - realplay.png - done - - # mozilla plugin - if use nsplugin ; then - exeinto /opt/netscape/plugins - doexe "${S}/mozilla/nphelix.so" - inst_plugin /opt/netscape/plugins/nphelix.so - - insinto /opt/netscape/plugins - doins "${S}/mozilla/nphelix.xpt" - inst_plugin /opt/netscape/plugins/nphelix.xpt - fi - - dodir /usr/bin - dosym "/opt/${MY_PN}/realplay" /usr/bin/realplay - - # Language resources - cd "${D}"/opt/RealPlayer/share/locale - for LC in *; do - mkdir -p "${D}"/usr/share/locale/${LC}/LC_MESSAGES - dosym /opt/RealPlayer/share/locale/${LC}/player.mo /usr/share/locale/${LC}/LC_MESSAGES/realplay.mo - dosym /opt/RealPlayer/share/locale/${LC}/widget.mo /usr/share/locale/${LC}/LC_MESSAGES/libgtkhx.mo - done - - cd "${S}" - dodoc README - dohtml share/hxplay_help.html share/tigris.css -} diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest deleted file mode 100644 index 8e53238..0000000 --- a/x11-drivers/ati-drivers/Manifest +++ /dev/null @@ -1,32 +0,0 @@ -AUX 0001-Linux-2.6.25.x-kernels-support.patch 848 RMD160 d0b7ebec8d149e66a94daae533b31dd082efe9ff SHA1 8a6d89d2f773978210d7e1125d148b853e939cbf SHA256 6d9615902f6ba156229f8fff6edaaa84eb4a16704df6f9e27242b1a18c78331e -AUX 0003-GCC-complains-return-with-a-value-in-function-ret.patch 400 RMD160 a71bc58a54efc3a768207c2c1e2d0e04c6fc2ebe SHA1 a22ebc52a6ccfa2ec25b47a860abe4633328f044 SHA256 11c4a2ce3c73dd41fa62793df4c4ac30d614a96703f33cd848f8d5d40da8331b -AUX 0004-Linux-2.6.26.x-kernels-firegl_public.c.patch 55494 RMD160 a3b3c5672a093c316ff739515c1a19e41caf938b SHA1 8cfa106c290069000e4c5e42e8af0febd439babd SHA256 df40f7fd29e78cab6104f068a5fac822b3cda42cb6416b14a516269d3c061999 -AUX 0005-Linux-2.6.26.x-kernels-firegl_public.h.patch 1787 RMD160 16cbc0c1b30d78affd76aae2498f90e6d778f26e SHA1 6e81c4d18710f069e2da6c340ff56ec7372fe559 SHA256 68ccd85f72abfd6b04578a864e1673fbea3d73a862a715b4f4d996e6ff795ccf -AUX 09ati 75 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 SHA1 01cac55ba02710dbd7d71737dd64dbec2cc081fd SHA256 5daa70f3e4c19f2b006bc7b2b22abde5404c3b498485b9ffac428eb458c32134 -AUX 8.37.6/fix-ioctl-for-2.6.22.patch 487 RMD160 93e739f8b832529a999ecca2e6a0d447a2ced42f SHA1 5a7e0416be0957d3ed46d0f16cdb25bd1a68359d SHA256 c3df802a987974109db9d439932e88a2cdfa37a37c1a284a56b7b100a3de8f23 -AUX 8.40.4/ati-drivers-2.6.23.patch 1497 RMD160 3bcd335769ee98b2119fc62784d091000115a5bd SHA1 9328ece148ad52c048805b9c2c3a3bf0937b6d16 SHA256 6ea6385e602b9659ca01ef1d53cb53ca955f2396a2d8cc914355d3bb2a590d88 -AUX 8.40.4/ati-drivers-8.40.4-warnings.patch 3262 RMD160 158206cf638fd0f2ee34e8ff02e6a399933f844d SHA1 7b47d4d89ff80e930cd2fc66f513dbaf66de07d5 SHA256 45caca456493c23a6475bbec63df26a33ead8de59bf52e3c06c4433740dc5261 -AUX 8.433/ati-powermode-opt-path-1.patch 1139 RMD160 b42a87eba428241428cee3467156a7c80b601b17 SHA1 7fa50f72453fe4501af40c8178b748aa39c599c9 SHA256 bdbcf9e8ec4a16868c1c1889cd2a4db2f00e5a6778ea6751fc1a1a75ead1f788 -AUX 8.443.1/ati-powermode-opt-path-2.patch 1493 RMD160 6d1275d8800d6703caaca78705eb1864e1142f82 SHA1 9c1df16348da5e3c32303342eeb31ee66f2a3487 SHA256 d8b11aa4974bfc58cc0550eaf988faad32a8b13cc7a92d222481802de2c71465 -AUX 8.452/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 -AUX 8.455.2/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 -AUX 8.471.3/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 -AUX 8.476/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 -AUX 8.532/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 -AUX 8.542/ati-drivers-2.6.27.patch 2930 RMD160 a6c51cc1c9096bfc0453477c195aa54881867995 SHA1 8b229af3a1b0fc625605336f5c8985be72b4360f SHA256 b1130d675b93c7a9dc9c014157ee4ead16d375fd73ee02f6a620018111642e26 -AUX 8.552/ati-drivers-xen-8.552.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58 -AUX 8.573/ati-drivers-xen-8.552.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58 -AUX 8.573/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 -AUX 8.582/ati-drivers-xen-8.552.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58 -AUX 8.582/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 -AUX ati-drivers-2.6.19.patch 3158 RMD160 b9b3af8169f4b0e7cf655f0da9b8dcb7946b204e SHA1 13d009989f24f5c568b156a128adcd8402f47c9a SHA256 278e5d2bbddf1b5956485698684f50609371c6ef1c432fd436c85ee3345e24f6 -AUX ati-drivers-2.6.20.patch 2386 RMD160 8b563155a63ba8d9639fa3b89719b8da49b2c8a3 SHA1 3714fa58e8ead0287d593cf0ed011e22327a5e71 SHA256 12b56122216a2fdba9f52e9939bf33f7d0c262417923ea9596c70337d44dd9f8 -AUX ati-drivers-8.35.5-2.6.19.patch 913 RMD160 511ef4e6eb7fcfa8db5419c05d160c6b538f9bc8 SHA1 adcd3860d1b0877779e85695053cda36511b4c71 SHA256 5c2b1ba7e291e118f37a87e3a653d0a654ee4e95a46c9e3d723ecef72aba1f01 -AUX ati-drivers-8.35.5-2.6.20.patch 333 RMD160 b9ef336b8dd4874854910d8eb62bc15f9ab066bd SHA1 8261034f3e539251adb0ca5b1da880e3f1231559 SHA256 cd4abde649ede2d03b5faa115acc567fcff85b6db39f19ba70d25e194e8973a6 -AUX ati-powermode-opt-path.patch 826 RMD160 450b5c9ecd7f4c123ce12f855b287e6b97e6ad23 SHA1 80725f60def6bd968157f09474c00722865b1f27 SHA256 e1d6dbe2e73c8ed575b2f9188e707fcb90f808d0fbdb686067c16f853662c208 -AUX ati-powermode.sh.patch 1142 RMD160 b81cdd4d2a49c2f7b04f7e00e4391b4e0ad67a40 SHA1 eef7f658474ca8e9e66ee1955a851782eba4dd0e SHA256 050602d5e0656961c0b16a75b470a7327a9e8b16f7d0ae3228341b3a8dcc9289 -AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3 -AUX atieventsd.rc6 590 RMD160 fbf8aba7ada36aed666d506d6b0f7146e1b2f4ad SHA1 b2b457a4122f0a3a5db785df46880351d795fb25 SHA256 a00aa241e53b21872218bd247bfdb6292a075d9ef641f36198d8f4e399cc025e -AUX libGL.la.in 749 RMD160 b2eb11cd123cb0e789adb1e22dffdbfc03542f69 SHA1 be41cc2eb1754a44134a95475be5f0cb894e24bc SHA256 a7b4b58b1311f8e1caf83222cb020dfbc48e2881a8deef21eddefa23b3992f13 -DIST ati-driver-installer-8-6-x86.x86_64.run 60476860 RMD160 87ae6e046e5c5cd69e8a43060b129602e876305a SHA1 7dddb509d44466d6c88c024c92272d8d2ae4c99d SHA256 a573b2a34b334b281382344af8e49e41db7286128ac368d8588a9852e5c00e8e -EBUILD ati-drivers-8.501-r10.ebuild 15000 RMD160 5f4966cd3fc11207c6d86b3eb6066b7f3416368b SHA1 a7378b2a88a4a8ecbacf202ba162200247b06459 SHA256 5738fcc09cb296cdc2c81c54cb508b819c121acfd70d64fafe3249f1ea13a9f0 diff --git a/x11-drivers/ati-drivers/ati-drivers-8.501-r10.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.501-r10.ebuild deleted file mode 100644 index f32c94c..0000000 --- a/x11-drivers/ati-drivers/ati-drivers-8.501-r10.ebuild +++ /dev/null @@ -1,443 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.501.ebuild,v 1.3 2008/07/09 22:33:19 opfer Exp $ - -IUSE="acpi debug" - -inherit eutils multilib linux-mod toolchain-funcs versionator - -DESCRIPTION="Ati precompiled drivers for recent chipsets" -HOMEPAGE="http://www.ati.com" -ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/" -SRC_URI="${ATI_URL}/ati-driver-installer-8-6-x86.x86_64.run" - -LICENSE="AMD GPL-2 QPL-1.0 as-is" -KEYWORDS="~amd64 x86" - -# The portage dep is for COLON_SEPARATED support in env-update. -# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update. -RDEPEND="x11-base/xorg-server - !x11-apps/ati-drivers-extra - >=app-admin/eselect-1.0.9 - app-admin/eselect-opengl - amd64? ( app-emulation/emul-linux-x86-xlibs ) - acpi? ( - x11-apps/xauth - sys-power/acpid - ) - x11-libs/libXrandr - >=sys-apps/portage-2.1.1-r1" - -DEPEND="${RDEPEND} - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto - x11-proto/inputproto" - -EMULTILIB_PKG="true" - -QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so - usr/lib/opengl/ati/lib/libGL.so.1.2 - opt/bin/amdcccle" -QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so - usr/lib32/dri/fglrx_dri.so - usr/lib64/opengl/ati/lib/libGL.so.1.2 - usr/lib32/opengl/ati/lib/libGL.so.1.2 - opt/bin/amdcccle" -QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so - usr/lib/xorg/modules/drivers/fglrx_drv.so - usr/lib/opengl/ati/lib/libGL.so.1.2 - usr/lib/xorg/modules/glesx.so - usr/lib/xorg/modules/amdxmm.so" -QA_TEXTRELS_amd64=" - usr/lib64/opengl/ati/lib/libGL.so.1.2 - usr/lib32/opengl/ati/lib/libGL.so.1.2 - usr/lib64/dri/fglrx_dri.so - usr/lib32/dri/fglrx_dri.so - usr/lib32/xorg/modules/glesx.so - usr/lib64/xorg/modules/glesx.so" - -S="${WORKDIR}" - -pkg_setup() { - - # Define module dir. - MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod" - - #check kernel and sets up KV_OBJ - MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)" - BUILD_TARGETS="kmod_build" - linux-mod_pkg_setup - BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}" - - if ! kernel_is 2 6; then - eerror "Need a 2.6 kernel to compile against!" - die "Need a 2.6 kernel to compile against!" - fi - - if kernel_is ge 2 6 25 && linux_chkconfig_present PREEMPT_RCU; then - die "${P} is not compatible RCU Preemption, please disable it" - fi - - if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then - eerror "${P} requires support for pci_find_slot." - die "${P} requires support for pci_find_slot." - fi - - if ! linux_chkconfig_present MTRR; then - ewarn "You don't have MTRR support enabled, the direct rendering will not work." - fi - - if linux_chkconfig_builtin DRM; then - ewarn "You have DRM support enabled builtin, the direct rendering will not work." - fi - - if ! linux_chkconfig_present AGP && \ - ! linux_chkconfig_present PCIEPORTBUS; then - ewarn "You need AGP and/or PCI Express support for direct rendering to work." - fi - - if linux_chkconfig_present PARAVIRT; then - eerror "The current ati-drivers don't compile when having" - eerror "paravirtualization active due to GPL symbol export" - eerror "restrictions." - eerror "Please disable it:" - eerror " CONFIG_PARAVIRT=n" - eerror "in /usr/src/linux/.config or" - eerror " Processor type and features -->" - eerror " [ ] Paravirtualization support (EXPERIMENTAL)" - eerror "in 'menuconfig'" - die "CONFIG_PARAVIRT enabled" - fi - - # Only support xorg-server >=1.1 - BASE_DIR="${S}/x710" - - # This is used like $(get_libdir) for paths in ati's package. - if use amd64 ; then - BASE_DIR="${BASE_DIR}_64a" - PKG_LIBDIR=lib64 - ARCH_DIR="${S}/arch/x86_64" - else - PKG_LIBDIR=lib - ARCH_DIR="${S}/arch/x86" - fi -} - -src_unpack() { - #Switching to a standard way to extract the files since otherwise no signature file - #would be created - local src="${DISTDIR}/${A}" - sh "${src}" --extract "${S}" 2&>1 /dev/null - - #patches needed for kernel 2.6.26 - epatch "${FILESDIR}"/0001-Linux-2.6.25.x-kernels-support.patch - epatch "${FILESDIR}"/0003-GCC-complains-return-with-a-value-in-function-ret.patch - epatch "${FILESDIR}"/0004-Linux-2.6.26.x-kernels-firegl_public.c.patch - epatch "${FILESDIR}"/0005-Linux-2.6.26.x-kernels-firegl_public.h.patch - - # These are the userspace utilities that we also have source for. - # We rebuild these later. - rm \ - "${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \ - "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \ - || die "bin rm failed" - - if use debug; then - # Enable debug mode in the Source Code. - sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \ - "${MODULE_DIR}/firegl_public.c" \ - || die "Failed to enable debug output." - fi - - if use acpi; then - sed -i \ - -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \ - -e "s:/var/lib/gdm/:/var/gdm/:" \ - "${S}/common/etc/ati/authatieventsd.sh" \ - || die "sed failed." - - # Since "who" is in coreutils, we're using that one instead of "finger". - sed -i -e 's:finger:who:' \ - "${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \ - || die "Replacing 'finger' with 'who' failed." - # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and - # add funktion to detect default state. - epatch "${FILESDIR}"/8.476/ati-powermode-opt-path-2.patch - fi - - pushd ${MODULE_DIR} >/dev/null - ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \ - || die "symlinking precompiled core failed" - - convert_to_m 2.6.x/Makefile || die "convert_to_m failed" - - # When built with ati's make.sh it defines a bunch of macros if - # certain .config values are set, falling back to less reliable - # detection methods if linux/autoconf.h is not available. We - # simply use the linux/autoconf.h settings directly, bypassing the - # detection script. - sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed" - sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \ - || die "MODVERSIONS sed failed" - popd >/dev/null - - mkdir extra || die "mkdir failed" - cd extra - unpack ./../common/usr/src/ati/fglrx_sample_source.tgz - sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \ - lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed" - # Add a category. - mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed" - cd .. -} - -src_compile() { - linux-mod_src_compile - - einfo "Building fgl_glxgears" - cd "${S}"/extra/fgl_glxgears - # These extra libs/utils either have an Imakefile that does not - # work very well without tweaking or a Makefile ignoring CFLAGS - # and the like. We bypass those. - - # The -DUSE_GLU is needed to compile using nvidia headers - # according to a comment in ati-drivers-extra-8.33.6.ebuild. - "$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \ - -I"${S}"/common/usr/include fgl_glxgears.c \ - -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed" - - einfo "Building fglrx_gamma lib" - cd "${S}"/extra/lib/fglrx_gamma - "$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \ - -DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \ - -lXext || die "fglrx_gamma lib build failed" - ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed" - ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed" - - einfo "Building fglrx_gamma util" - cd "${S}"/extra/programs/fglrx_gamma - "$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \ - -I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \ - fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \ - || die "fglrx_gamma util build failed" - -} - -src_install() { - linux-mod_src_install - - # We can do two things here, and neither of them is very nice. - - # For direct rendering libGL has to be able to load one or more - # dri modules (files ending in _dri.so, like fglrx_dri.so). - # Gentoo's mesa looks for these files in the location specified by - # LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded - # location /usr/$(get_libdir)/dri. Ati's libGL does the same - # thing, but the hardcoded location is /usr/X11R6/lib/modules/dri - # on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64 - # 64bit. So we can either put the .so files in that (unusual, - # compared to "normal" mesa libGL) location or set - # LIBGL_DRIVERS_PATH. We currently do the latter. See also bug - # 101539. - - # The problem with this approach is that LIBGL_DRIVERS_PATH - # *overrides* the default hardcoded location, it does not extend - # it. So if ati-drivers is merged but a non-ati libGL is selected - # and its hardcoded path does not match our LIBGL_DRIVERS_PATH - # (because it changed in a newer mesa or because it was compiled - # for a different set of multilib abis than we are) stuff breaks. - - # We create one file per ABI to work with "native" multilib, see - # below. - - echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep" - doenvd "${T}/03ati-colon-sep" - - # All libraries that we have a 32 bit and 64 bit version of on - # amd64 are installed in src_install-libs. Everything else - # (including libraries only available in native 64bit on amd64) - # goes in here. - - # There used to be some code here that tried to detect running - # under a "native multilib" portage ((precursor of) - # http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it - # should just work (only doing some duplicate work). --marienz - if has_multilib_profile; then - local OABI=${ABI} - for ABI in $(get_install_abis); do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs - fi - - # This is sorted by the order the files occur in the source tree. - - # X modules. - exeinto /usr/$(get_libdir)/xorg/modules/drivers - doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so - exeinto /usr/$(get_libdir)/xorg/modules/linux - doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so - exeinto /usr/$(get_libdir)/xorg/modules - doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so,amdxmm.so} - - # Arch-specific files. - # (s)bin. - into /opt - if use acpi; then - dosbin "${ARCH_DIR}"/usr/sbin/atieventsd - fi - # We cleaned out the compilable stuff in src_unpack - dobin "${ARCH_DIR}"/usr/X11R6/bin/* - - # lib. - exeinto /usr/$(get_libdir) - # Everything except for the libGL.so installed in src_install-libs. - doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \ - -maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*') - insinto /usr/$(get_libdir) - doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \ - -maxdepth 1 -type f -not -name '*.so*') - - # Common files. - # etc. - insinto /etc/ati - # Everything except for the authatieventsd.sh script. - doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default} - if use acpi; then - doins common/etc/ati/authatieventsd.sh - fi - - # include. - insinto /usr - doins -r common/usr/include - insinto /usr/include/X11/extensions - doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h - - # Just the atigetsysteminfo.sh script. - into /usr - dosbin common/usr/sbin/* - - # data files for the control panel. - insinto /usr/share - doins -r common/usr/share/ati - insinto /usr/share/pixmaps - doins common/usr/share/icons/ccc_{large,small}.xpm - make_desktop_entry amdcccle 'ATI Catalyst Control Center' \ - ccc_large System - - # doc. - dohtml -r common/usr/share/doc/fglrx - - if use acpi; then - doman common/usr/share/man/man8/atieventsd.8 - - pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null - - exeinto /etc/acpi - doexe ati-powermode.sh - insinto /etc/acpi/events - doins events/* - - popd >/dev/null - fi - - # Done with the "source" tree. Install tools we rebuilt: - dobin extra/fgl_glxgears/fgl_glxgears - newdoc extra/fgl_glxgears/README README.fgl_glxgears - - dolib extra/lib/fglrx_gamma/*so* - newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma - - dobin extra/programs/fglrx_gamma/fglrx_xgamma - doman extra/programs/fglrx_gamma/fglrx_xgamma.1 - newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma - - # Gentoo-specific stuff: - if use acpi; then - newinitd "${FILESDIR}"/atieventsd.init atieventsd \ - || die "Failed to install atieventsd.init.d" - echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf - newconfd "${T}"/atieventsd.conf atieventsd - fi -} - -src_install-libs() { - if [[ "${ABI}" == "amd64" ]]; then - local pkglibdir=lib64 - local MY_ARCH_DIR="${S}/arch/x86_64" - else - local pkglibdir=lib - local MY_ARCH_DIR="${S}/arch/x86" - fi - einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system" - - local ATI_ROOT=/usr/$(get_libdir)/opengl/ati - # To make sure we do not miss a spot when these change. - local libmajor=1 libminor=2 - local libver=${libmajor}.${libminor} - - # The GLX libraries - # (yes, this really is "lib" even on amd64/multilib --marienz) - exeinto ${ATI_ROOT}/lib - doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so - - # Same as the xorg implementation (eselect opengl does not fall - # back to xorg-x11 if we omit this symlink, meaning no glx). - dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions - - # DRI modules, installed into the path used by recent versions of mesa. - exeinto /usr/$(get_libdir)/dri - doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so - - # Make up a libGL.la. Ati does not provide one, but mesa does. If - # a (libtool-based) libfoo is built with libGL.la present a - # reference to it is put into libfoo.la, and compiling - # (libtool-based) things that link too libfoo.la will complain if - # libGL.la disappears. So if we do not make up a libGL.la - # switching between mesa and ati becomes painful. - local revision=$(printf '%d%02d%02d' $(get_version_components)) - sed -e "s:\${libmajor}:${libmajor}:g" \ - -e "s:\${libminor}:${libminor}:g" \ - -e "s:\${libdir}:$(get_libdir):g" \ - -e "s:\${revision}:${revision}:g" \ - "${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \ - || die "sed failed to make libGL.la" - - local envname="${T}"/04ati-dri-path - if [[ -n ${ABI} ]]; then - envname="${envname}-${ABI}" - fi - echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}" - doenvd "${envname}" -} - -pkg_postinst() { - /usr/bin/eselect opengl set --use-old ati - - elog "To switch to ATI OpenGL, run \"eselect opengl set ati\"" - elog "To change your xorg.conf you can use the bundled \"aticonfig\"" - elog - elog "If you experience unexplained segmentation faults and kernel crashes" - elog "with this driver and multi-threaded applications such as wine," - elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2." - elog - elog "You will have to source /etc/profile (or logout and back in) for dri" - elog "to work, unless you previously had ati-drivers installed." - - # Workaroud screen corruption - ewarn "If you experience screen corruption with this driver, try putting" - ewarn ' Option "XAANoOffscreenPixmaps" "true"' - ewarn "in the Device Section of /etc/X11/xorg.conf." - - linux-mod_pkg_postinst -} - -pkg_postrm() { - linux-mod_pkg_postrm - /usr/bin/eselect opengl set --use-old xorg-x11 -} diff --git a/x11-drivers/ati-drivers/files/0001-Linux-2.6.25.x-kernels-support.patch b/x11-drivers/ati-drivers/files/0001-Linux-2.6.25.x-kernels-support.patch deleted file mode 100644 index 74c34b0..0000000 --- a/x11-drivers/ati-drivers/files/0001-Linux-2.6.25.x-kernels-support.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.c -+++ common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -4956,8 +4956,9 @@ static unsigned long kasSetExecutionLevel(unsigned long level) - { - unsigned long orig_level; - -- orig_level = __get_cpu_var(kasExecutionLevel); -+ orig_level = get_cpu_var(kasExecutionLevel); - __get_cpu_var(kasExecutionLevel) = level; -+ put_cpu_var(kasExecutionLevel); - - return orig_level; - } -@@ -4969,7 +4970,12 @@ static unsigned long kasSetExecutionLevel(unsigned long level) - */ - static unsigned long kas_GetExecutionLevel(void) - { -- return __get_cpu_var(kasExecutionLevel); -+ unsigned long orig_level; -+ -+ orig_level = get_cpu_var(kasExecutionLevel); -+ put_cpu_var(kasExecutionLevel); -+ -+ return orig_level; - } - - /** \brief Type definition for kas_spin_lock() parameter */ diff --git a/x11-drivers/ati-drivers/files/0003-GCC-complains-return-with-a-value-in-function-ret.patch b/x11-drivers/ati-drivers/files/0003-GCC-complains-return-with-a-value-in-function-ret.patch deleted file mode 100644 index 93b78ed..0000000 --- a/x11-drivers/ati-drivers/files/0003-GCC-complains-return-with-a-value-in-function-ret.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.c -+++ common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -3190,7 +3190,7 @@ int ATI_API_CALL __ke_register_ioctl32_conversion(unsigned int cmd, int (*handle - void ATI_API_CALL __ke_unregister_ioctl32_conversion(unsigned int cmd) - { - #ifdef FIREGL_IOCTL_COMPAT -- return 0; -+ return; - #else - unregister_ioctl32_conversion(cmd); - #endif diff --git a/x11-drivers/ati-drivers/files/0004-Linux-2.6.26.x-kernels-firegl_public.c.patch b/x11-drivers/ati-drivers/files/0004-Linux-2.6.26.x-kernels-firegl_public.c.patch deleted file mode 100644 index b466c39..0000000 --- a/x11-drivers/ati-drivers/files/0004-Linux-2.6.26.x-kernels-firegl_public.c.patch +++ /dev/null @@ -1,1726 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.c -+++ common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -24,13 +24,13 @@ - // ============================================================ - #include - --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) - #error Kernel versions older than 2.6.0 are no longer supported by this module. --#endif -+#endif - - #include - --#if !defined(CONFIG_X86_PC) -+#if !defined(CONFIG_X86_PC) - #if !defined(CONFIG_X86_64) - #if !defined(CONFIG_X86_VOYAGER) - #if !defined(CONFIG_X86_NUMAQ) -@@ -62,10 +62,10 @@ - * distribution would even include such a kernel patch. */ - #ifdef CONFIG_MEM_MIRROR - /* Prevent asm/mm_track.h from being included in subsequent -- * kernel headers as that would redefine CONFIG_MEM_MIRROR. */ -+ * kernel headers as that would redefine CONFIG_MEM_MIRROR. */ - #ifndef CONFIG_X86_64 - #define __I386_MMTRACK_H__ --#define mm_track(ptep) -+#define mm_track(ptep) - #else - #define __X86_64_MMTRACK_H__ - #define mm_track_pte(ptep) -@@ -93,7 +93,7 @@ - #include - #include - #include --#include -+//#include - #include - #include - #include -@@ -151,8 +151,8 @@ - #include "linux/freezer.h" - #endif - --// For 2.6.18 or higher, the UTS_RELEASE is defined in the linux/utsrelease.h. --#ifndef UTS_RELEASE -+// For 2.6.18 or higher, the UTS_RELEASE is defined in the linux/utsrelease.h. -+#ifndef UTS_RELEASE - #include - #endif - -@@ -210,7 +210,7 @@ char* firegl = NULL; - int __ke_debuglevel = 0; - int __ke_moduleflags = 0; - --static struct pci_device_id fglrx_pci_table[] = -+static struct pci_device_id fglrx_pci_table[] = - { - #define FGL_ASIC_ID(x) \ - { \ -@@ -278,7 +278,7 @@ const unsigned long __ke_PAE_State = 1; - - static int firegl_pat_enabled = 0; - static unsigned long KCL_pat[2]; --static unsigned long KCL_orig_pat[2]; -+static unsigned long KCL_orig_pat[2]; - - static int ATI_API_CALL KCL_enable_pat(void); - static void ATI_API_CALL KCL_disable_pat(void); -@@ -305,7 +305,7 @@ long ip_firegl_compat_ioctl(struct file* filp, unsigned int cmd, unsigned long a - #endif - - __ke_ssize_t ip_firegl_read( struct file *filp, -- char *buf, -+ char *buf, - __ke_size_t size, - __ke_loff_t *off_ptr) - { -@@ -313,7 +313,7 @@ __ke_ssize_t ip_firegl_read( struct file *filp, - } - - __ke_ssize_t ip_firegl_write( struct file *filp, -- const char *buf, -+ const char *buf, - __ke_size_t size, - __ke_loff_t *off_ptr) - { -@@ -449,34 +449,34 @@ READ_PROC_WRAP(firegl_debug_info) - READ_PROC_WRAP(firegl_bios_version) - READ_PROC_WRAP(firegl_interrupt_info) - --static int -+static int - firegl_interrupt_open_wrap( -- struct inode *inode, -- struct file *file) -+ struct inode *inode, -+ struct file *file) - { - return firegl_interrupt_open(inode, file); - } - --static int -+static int - firegl_interrupt_release_wrap( -- struct inode *inode, -- struct file *file) -+ struct inode *inode, -+ struct file *file) - { - return firegl_interrupt_release(inode, file); - } - --static ssize_t -+static ssize_t - firegl_interrupt_read_wrap( -- struct file *user_file, -- char __user *user_buf, -- size_t user_buf_size, -+ struct file *user_file, -+ char __user *user_buf, -+ size_t user_buf_size, - loff_t *user_file_pos) - { - return (ssize_t) firegl_interrupt_read(user_file, user_buf, user_buf_size, user_file_pos); - } - --static unsigned int --firegl_interrupt_poll_wrap(struct file *user_file, poll_table *pt) -+static unsigned int -+firegl_interrupt_poll_wrap(struct file *user_file, poll_table *pt) - { - if(firegl_interrupt_poll(user_file, (__ke_poll_table*)pt)) - { -@@ -488,11 +488,11 @@ firegl_interrupt_poll_wrap(struct file *user_file, poll_table *pt) - } - } - --static ssize_t -+static ssize_t - firegl_interrupt_write_wrap( -- struct file *user_file, -- const char __user *user_buf, -- size_t user_buf_size, -+ struct file *user_file, -+ const char __user *user_buf, -+ size_t user_buf_size, - loff_t *user_file_pos) - { - return (ssize_t) firegl_interrupt_write(user_file, user_buf, user_buf_size, user_file_pos); -@@ -502,7 +502,7 @@ firegl_interrupt_write_wrap( - * \param func function to be wrapped - * \return None */ - --static void -+static void - firegl_smp_func_parameter_wrap( - void *func) - { -@@ -517,7 +517,7 @@ static struct file_operations firegl_interrupt_file_ops = { - .write = firegl_interrupt_write_wrap - }; - --__ke_proc_list_t firegl_proc_list[] = -+__ke_proc_list_t firegl_proc_list[] = - { - { "name", drm_name_info_wrap, NULL}, - { "mem", drm_mem_info_wrap, NULL}, -@@ -586,11 +586,11 @@ static struct proc_dir_entry *firegl_proc_init( device_t *dev, - { - ent->proc_fops = (struct file_operations*)list->fops; - } -- -+ - { - ent->data = (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev); - } -- -+ - list++; - } - -@@ -623,7 +623,7 @@ static int firegl_proc_cleanup( int minor, - { - remove_proc_entry("dri", NULL); - __KE_DEBUG("remove proc dri. \n"); -- } -+ } - return 0; - } - -@@ -661,12 +661,12 @@ static int firegl_stub_getminor(const char *name, struct file_operations *fops, - { - int i; - int count = 0; -- -+ - __KE_DEBUG("firegl_stub_getminor: name=\"%s\"\n", name); - -- for( i = 0; i < FIREGL_STUB_MAXCARDS; i++ ) -+ for( i = 0; i < FIREGL_STUB_MAXCARDS; i++ ) - { -- if( !firegl_stub_list[i].fops ) -+ if( !firegl_stub_list[i].fops ) - { - firegl_stub_list[i].name = name; - firegl_stub_list[i].fops = fops; -@@ -693,16 +693,16 @@ static int firegl_stub_putminor(int minor) - if (minor < 0 || minor >= FIREGL_STUB_MAXCARDS) - { - return -1; -- } -+ } - firegl_proc_cleanup(minor, firegl_stub_root, firegl_stub_list[minor].dev_root, firegl_stub_list[minor].proclist); - firegl_stub_list[minor].name = NULL; - firegl_stub_list[minor].fops = NULL; - firegl_stub_list[minor].proclist = NULL; - -- if( minor == (firegl_minors-1) ) -+ if( minor == (firegl_minors-1) ) - { - unregister_chrdev(DRM_MAJOR, "drm"); -- } -+ } - return 0; - } - -@@ -726,7 +726,7 @@ static int __init firegl_stub_register(const char *name, struct file_operations - return -1; - } else if(err == -EBUSY) { - -- // the registering of the module's device has failed -+ // the registering of the module's device has failed - // because there was already some other drm module loaded. - __KE_DEBUG("register_chrdev() failed with -EBUSY\n"); - return -1; -@@ -758,7 +758,7 @@ static int fglrx_pci_probe(struct pci_dev *dev, const struct pci_device_id *id_t - /* Starting from 2.6.14, kernel has new struct defined for pm_message_t, - we have to handle this case separately. - 2.6.11/12/13 kernels have pm_message_t defined as int and older kernels -- don't have pm_message_t defined. -+ don't have pm_message_t defined. - */ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) - static int fglrx_pci_suspend(struct pci_dev *pdev, pm_message_t pm_event) -@@ -794,9 +794,9 @@ static int fglrx_pci_suspend(struct pci_dev *pdev, u32 pm_event) - - if (!ret) - { -- -- // since privdev->pcidev is acquired in X server, use pdev -- // directly here to allow suspend/resume without X server start. -+ -+ // since privdev->pcidev is acquired in X server, use pdev -+ // directly here to allow suspend/resume without X server start. - firegl_pci_save_state((__ke_pci_dev_t*)pdev, privdev); - pci_disable_device(pdev); - PMSG_EVENT(pdev->dev.power.power_state) = state; -@@ -848,13 +848,13 @@ static int fglrx_pci_resume(struct pci_dev *pdev) - // before pci_set_master! - firegl_pci_restore_state((__ke_pci_dev_t*)pdev, privdev); - -- if (pci_enable_device(pdev)) -+ if (pci_enable_device(pdev)) - { - __KE_ERROR("Cannot enable PCI device.\n"); -- } -+ } - - pci_set_master(pdev); -- -+ - firegl_cail_powerup(privdev); - - if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND) -@@ -865,7 +865,7 @@ static int fglrx_pci_resume(struct pci_dev *pdev) - return 0; - } - --static struct pci_driver fglrx_pci_driver = -+static struct pci_driver fglrx_pci_driver = - { - .name = "fglrx_pci", - .id_table = fglrx_pci_table, -@@ -921,10 +921,10 @@ static int firegl_init_devices(__ke_device_t *pubdev) - { - pid = (struct pci_device_id *) &fglrx_pci_table[i]; - pdev = NULL; -- while (( pdev = pci_get_subsys(pid->vendor, -- pid->device, -- PCI_ANY_ID, -- PCI_ANY_ID, -+ while (( pdev = pci_get_subsys(pid->vendor, -+ pid->device, -+ PCI_ANY_ID, -+ PCI_ANY_ID, - pdev)) != NULL) - { - num_of_devices++; -@@ -934,7 +934,7 @@ static int firegl_init_devices(__ke_device_t *pubdev) - - if (firegl_init_device_heads(num_of_devices)) - { -- return -ENOMEM; -+ return -ENOMEM; - } - - for (i=0; fglrx_pci_table[i].vendor != 0; i++) -@@ -942,15 +942,15 @@ static int firegl_init_devices(__ke_device_t *pubdev) - pid = (struct pci_device_id *) &fglrx_pci_table[i]; - - pdev = NULL; -- while (( pdev = pci_get_subsys(pid->vendor, -- pid->device, -- PCI_ANY_ID, -- PCI_ANY_ID, -+ while (( pdev = pci_get_subsys(pid->vendor, -+ pid->device, -+ PCI_ANY_ID, -+ PCI_ANY_ID, - pdev)) != NULL) - { - if ((ret_code = firegl_get_dev(pubdev, pdev))) - { -- return ret_code; -+ return ret_code; - } - - j++; -@@ -983,7 +983,7 @@ static int __init firegl_init_module(void) - // init global vars that are in fact constants - __ke_HZ = HZ; - --#ifdef _KE_SERIAL_DEBUG -+#ifdef _KE_SERIAL_DEBUG - __ke_SetSerialPort(); - #endif - -@@ -995,11 +995,11 @@ static int __init firegl_init_module(void) - return retcode; - } - --#ifdef FIREGL_CF_SUPPORT -+#ifdef FIREGL_CF_SUPPORT - adapter_chain_init(); - cf_object_init(); --#endif -- -+#endif -+ - // init DRM proc list - drm_proclist = kmalloc((DRM_PROC_ENTRIES + 1) * sizeof(__ke_proc_list_t), GFP_KERNEL); - if ( drm_proclist == NULL ) -@@ -1087,7 +1087,7 @@ static int __init firegl_init_module(void) - dev->pubdev.date, - firegl_minors); - -- -+ - #ifdef FIREGL_POWER_MANAGEMENT - if (pci_register_driver (&fglrx_pci_driver) < 0) - { -@@ -1117,12 +1117,12 @@ static void __exit firegl_cleanup_module(void) - { - KCL_disable_pat(); - __KE_INFO("Disable PAT\n"); -- } -+ } - #endif // FIREGL_USWC_SUPPORT - - for (i = 0; i < count; i++) - { -- if ( firegl_stub_unregister(i) ) -+ if ( firegl_stub_unregister(i) ) - { - __KE_ERROR("Cannot unload module on minor: %d\n", i); - } -@@ -1144,10 +1144,10 @@ static void __exit firegl_cleanup_module(void) - dev->pubdev.patchlevel, - dev->pubdev.date); - --#ifdef FIREGL_CF_SUPPORT -+#ifdef FIREGL_CF_SUPPORT - cf_object_cleanup(); -- adapter_chain_cleanup(); --#endif // FIREGL_CF_SUPPORT -+ adapter_chain_cleanup(); -+#endif // FIREGL_CF_SUPPORT - - firegl_private_cleanup (&dev->pubdev); - -@@ -1225,18 +1225,18 @@ void ATI_API_CALL __ke_add_wait_queue(__ke_wait_queue_head_t* queue_head, __ke_w - void ATI_API_CALL __ke_remove_wait_queue(__ke_wait_queue_head_t* queue_head, __ke_wait_queue_t* entry) - { - // current->state = TASK_RUNNING; -- remove_wait_queue((wait_queue_head_t*)(void *)queue_head, -+ remove_wait_queue((wait_queue_head_t*)(void *)queue_head, - (wait_queue_t*)(void *)entry); - } - - void ATI_API_CALL __ke_init_waitqueue_head(__ke_wait_queue_head_t* queue_head) - { -- init_waitqueue_head((wait_queue_head_t*)(void *)queue_head); -+ init_waitqueue_head((wait_queue_head_t*)(void *)queue_head); - } - - void ATI_API_CALL __ke_wait_event_interruptible(__ke_wait_queue_head_t* queue_head, int condition) - { -- wait_event_interruptible(*((wait_queue_head_t*)(void *)queue_head), condition); -+ wait_event_interruptible(*((wait_queue_head_t*)(void *)queue_head), condition); - } - - void ATI_API_CALL __ke_poll_wait(struct file* filp, __ke_wait_queue_head_t* queue_head, __ke_poll_table* pt) -@@ -1247,13 +1247,13 @@ void ATI_API_CALL __ke_poll_wait(struct file* filp, __ke_wait_queue_head_t* queu - void ATI_API_CALL *__ke_asyncio_alloc_sema() - { - int i; -- -+ - for(i=0; i= KERNEL_VERSION(2,6,17) -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) - rcu_read_lock(); --#else -+#else - read_lock(&tasklist_lock); --#endif -- p = find_task_by_pid( pid ); -- if (p) -+#endif -+ p = find_task_by_vpid( pid ); -+ if (p) - { - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) -- if (p->exit_state != EXIT_ZOMBIE && p->exit_state != EXIT_DEAD) -+ if (p->exit_state != EXIT_ZOMBIE && p->exit_state != EXIT_DEAD) - #else -- if (!(p->flags & PF_EXITING)) -+ if (!(p->flags & PF_EXITING)) - #endif - { - process_terminated = 0; - } -- } --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) -+ } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) - rcu_read_unlock(); --#else -+#else - read_unlock(&tasklist_lock); --#endif -+#endif - return process_terminated; - } - --/** /brief Call global OS kernel task/thread scheduler -+/** /brief Call global OS kernel task/thread scheduler - * /return Nonzero if a system call was awakened by a signal - */ - int ATI_API_CALL KCL_GetSignalStatus(void) -@@ -1432,15 +1432,15 @@ void ATI_API_CALL __ke_unblock_all_signals(void) - unblock_all_signals(); - } - --#if defined(__i386__) -+#if defined(__i386__) - #ifndef __HAVE_ARCH_CMPXCHG --static inline --unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old, -- unsigned long new, int size) --{ -- unsigned long prev; -- switch (size) { -- case 1: -+static inline -+unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old, -+ unsigned long new, int size) -+{ -+ unsigned long prev; -+ switch (size) { -+ case 1: - __asm__ __volatile__(LOCK_PREFIX "cmpxchgb %b1,%2" - : "=a"(prev) - : "q"(new), "m"(*__xg(ptr)), "0"(old) -@@ -1551,7 +1551,7 @@ struct inode* ATI_API_CALL __ke_get_file_inode(struct file* filp) - */ - KCL_TYPE_Pid ATI_API_CALL KCL_GetPid(void) - { -- return current->pid; -+ return current->pid; - } - - /** /brief Return the current Thread Group ID -@@ -1559,7 +1559,7 @@ KCL_TYPE_Pid ATI_API_CALL KCL_GetPid(void) - */ - KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(void) - { -- return current->tgid; -+ return current->tgid; - } - - /** /brief Return the effective user ID -@@ -1655,7 +1655,7 @@ static int KCL_MAP_KernelConfigParam[] = - 1 - #else - 0 --#endif -+#endif - }; - - /** /brief Check whether a kernel configuration parameter is defined -@@ -1718,13 +1718,13 @@ unsigned long ATI_API_CALL __ke_get_resource_start(__ke_pci_dev_t *dev, unsigned - #if defined(__x86_64__) || defined(__ia64__) - void* ATI_API_CALL __ke_pci_alloc_consistent(__ke_pci_dev_t* dev, int size, void *dma_handle) - { -- return (pci_alloc_consistent( (struct pci_dev*)(void *)dev, size, dma_handle)); -+ return (pci_alloc_consistent( (struct pci_dev*)(void *)dev, size, dma_handle)); - } - - void ATI_API_CALL __ke_pci_free_consistent(__ke_pci_dev_t* dev, int size, unsigned long cpu_addr, - unsigned int dma_handle) - { -- pci_free_consistent( (struct pci_dev*)(void *)dev, size, (void *)cpu_addr, -+ pci_free_consistent( (struct pci_dev*)(void *)dev, size, (void *)cpu_addr, - (unsigned long)dma_handle); - } - #endif // __ia64__ -@@ -1748,7 +1748,7 @@ static int KCL_MAP_ErrorCode[] = - - /** \brief This function maps OS independent error conditions to OS defined error codes - * \param errcode OS independent error condition code -- * \return OS kernel defined error code corresponding to the requested error condition -+ * \return OS kernel defined error code corresponding to the requested error condition - */ - int ATI_API_CALL KCL_GetErrorCode(KCL_ENUM_ErrorCode errcode) - { -@@ -1766,7 +1766,7 @@ int ATI_API_CALL KCL_GetErrorCode(KCL_ENUM_ErrorCode errcode) - int ATI_API_CALL firegl_get_user_ptr(u32 *src, void **dst) - { - unsigned long temp; -- int err = get_user(temp, src); -+ int err = get_user(temp, src); - *dst = (void*) temp; - return err; - } -@@ -1906,7 +1906,7 @@ void ATI_API_CALL __ke_atomic_set(void* v, int val) - - int ATI_API_CALL __ke_atomic_dec_and_test(void* v) - { -- return atomic_dec_and_test((atomic_t*)v); -+ return atomic_dec_and_test((atomic_t*)v); - } - - /*****************************************************************************/ -@@ -2006,19 +2006,19 @@ void ATI_API_CALL __ke_print_debug(const char* fmt, ...) - #endif - - #ifdef _KE_SERIAL_DEBUG --// To enable serial port debug message dumping,just define _KE_SERIAL_DEBUG in firegl_public.h file. --// Connect two PC with a null modern serial cable. run Hyper ternimal on the remote machine. --// It's useful to debug resume if network not works properly and serial port is not recovered -+// To enable serial port debug message dumping,just define _KE_SERIAL_DEBUG in firegl_public.h file. -+// Connect two PC with a null modern serial cable. run Hyper ternimal on the remote machine. -+// It's useful to debug resume if network not works properly and serial port is not recovered - // properly when fglrx resume hook is called... -- -- -+ -+ - #define SER_DATA_PORT 0x3f8 - #define SER_INT_CTRL_PORT SER_DATA_PORT + 1 - #define SER_INT_STAT_PORT SER_DATA_PORT + 2 - #define SER_LINE_CTRL_PORT SER_DATA_PORT + 3 - #define SER_MODEM_CTRL_PORT SER_DATA_PORT + 4 - #define SER_LINE_STAT_PORT SER_DATA_PORT + 5 -- -+ - void ATI_API_CALL __ke_printc(char c) - { - while((inb(SER_LINE_STAT_PORT) & 0x20) == 0 ); //wait until Transmitter Holding Register Empty -@@ -2028,7 +2028,7 @@ void ATI_API_CALL __ke_printc(char c) - void ATI_API_CALL __ke_printstr(const char *str) - { - int len = strlen(str); -- while(len--)__ke_printc(*str++); -+ while(len--)__ke_printc(*str++); - } - - int ATI_API_CALL __ke_SerPrint(const char *format, ...) -@@ -2041,26 +2041,26 @@ int ATI_API_CALL __ke_SerPrint(const char *format, ...) - vsprintf(buffer, format, ap); - - va_end(ap); -- -+ - __ke_printstr(buffer); -- -+ - return 0; - } - void ATI_API_CALL __ke_SetSerialPort() - { - DRM_INFO("setup serial port\n"); -- outb(0x00, SER_INT_CTRL_PORT); // Turn off interrupts -- -- outb(0x80, SER_LINE_CTRL_PORT); // SET DLAB ON -- outb(0x01, SER_DATA_PORT); // Set Baud rate - Divisor Latch Low Byte -- // 0x01 = 115,200 ,0x02 = 57,600, 0x06 = 19,200 BPS, 0x0C = 9,600 BPS -- outb(0x00, SER_DATA_PORT + 1); // Set Baud rate - Divisor Latch High Byte -- outb(0x03, SER_LINE_CTRL_PORT); // reset DLAB ,8 Bits, No Parity, 1 Stop Bit -- outb(0xC7, SER_DATA_PORT + 2); // FIFO Control Register -+ outb(0x00, SER_INT_CTRL_PORT); // Turn off interrupts -+ -+ outb(0x80, SER_LINE_CTRL_PORT); // SET DLAB ON -+ outb(0x01, SER_DATA_PORT); // Set Baud rate - Divisor Latch Low Byte -+ // 0x01 = 115,200 ,0x02 = 57,600, 0x06 = 19,200 BPS, 0x0C = 9,600 BPS -+ outb(0x00, SER_DATA_PORT + 1); // Set Baud rate - Divisor Latch High Byte -+ outb(0x03, SER_LINE_CTRL_PORT); // reset DLAB ,8 Bits, No Parity, 1 Stop Bit -+ outb(0xC7, SER_DATA_PORT + 2); // FIFO Control Register - outb(0x0b, SER_DATA_PORT + 4); // Turn on DTR, RTS, and OUT2 -- -+ - __ke_printstr("serial port 0x3f8 is set ready for message print out \n"); --} -+} - #endif - - /** \brief Get number of available RAM pages -@@ -2241,7 +2241,7 @@ void *ATI_API_CALL __ke_vmalloc_to_addr(void *vmalloc_addr) - struct page *page = NULL; - - page = vmalloc_to_page(vmalloc_addr); -- if(page == NULL) -+ if(page == NULL) - { - __KE_ERROR("__ke_vmalloc_to_addr: invalid page!"); - return NULL; -@@ -2283,7 +2283,7 @@ int ATI_API_CALL __ke_do_munmap(unsigned long addr, unsigned long len) - retcode = do_munmap(current->mm, - addr, - len); --#endif -+#endif - up_write(¤t->mm->mmap_sem); - return retcode; - } -@@ -2327,10 +2327,10 @@ long long ATI_API_CALL __divdi3(long long n, long long base) - minus = !minus; - } - else -- { -+ { - ubase = base; - } -- -+ - do_div(un, ubase); - return (minus? -un : un); - } -@@ -2360,7 +2360,7 @@ long long ATI_API_CALL __moddi3(long long n, long long base) - else - { - ubase = base; -- } -+ } - - rem = do_div(un, ubase); - return (minus? -rem : rem); -@@ -2391,7 +2391,7 @@ void* ATI_API_CALL __ke_vmap(unsigned long *pagelist, unsigned int count) - vaddr = (void *) vmap(pages, count); - #else - #ifdef VM_MAP -- vaddr = (void *) vmap(pages, count, VM_MAP, PAGE_KERNEL); -+ vaddr = (void *) vmap(pages, count, VM_MAP, PAGE_KERNEL); - #else - vaddr = (void *) vmap(pages, count, 0, PAGE_KERNEL); - #endif -@@ -2447,7 +2447,7 @@ void ATI_API_CALL __ke_vunmap(void* addr) - } - #endif // defined(VM_MAP) || defined(vunmap) - --/** \brief Reserve a memory page -+/** \brief Reserve a memory page - * - * \param pt Kernel logical address of the page - * -@@ -2459,7 +2459,7 @@ void ATI_API_CALL KCL_ReserveMemPage(void* pt) - SetPageReserved(virt_to_page((unsigned long)pt)); - } - --/** \brief Unreserve a memory page -+/** \brief Unreserve a memory page - * - * \param pt Kernel logical address of the page - * -@@ -2471,7 +2471,7 @@ void ATI_API_CALL KCL_UnreserveMemPage(void* pt) - ClearPageReserved(virt_to_page((unsigned long)pt)); - } - --/** \brief Lock a memory page -+/** \brief Lock a memory page - * - * \param pt Kernel logical address of the page - * -@@ -2480,14 +2480,14 @@ void ATI_API_CALL KCL_UnreserveMemPage(void* pt) - */ - void ATI_API_CALL KCL_LockMemPage(void* pt) - { --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) - SetPageReserved(virt_to_page((unsigned long)pt)); - #else - lock_page(virt_to_page((unsigned long)pt)); - #endif - } - --/** \brief Unlock a memory page -+/** \brief Unlock a memory page - * - * \param pt Kernel logical address of the page - * -@@ -2496,7 +2496,7 @@ void ATI_API_CALL KCL_LockMemPage(void* pt) - */ - void ATI_API_CALL KCL_UnlockMemPage(void* pt) - { --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) - ClearPageReserved(virt_to_page((unsigned long)pt)); - #else - unlock_page(virt_to_page((unsigned long)pt)); -@@ -2521,7 +2521,7 @@ void* ATI_API_CALL __ke_get_vmptr( struct _agp_memory* memory ) - return memory->vmptr; - } - #endif -- -+ - void* ATI_API_CALL __ke_ioremap(unsigned long offset, unsigned long size) - { - return ioremap(offset, size); -@@ -2592,7 +2592,7 @@ void ATI_API_CALL KCL_flush_tlb_onepage(struct vm_area_struct * vma, unsigned lo - { - /*Some kernel developer removed the export of symbol "flush_tlb_page" on 2.6.25 x86_64 SMP kernel. - Define a simple version here.*/ --#if defined(__x86_64__) && defined(__SMP__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) -+#if defined(__x86_64__) && defined(__SMP__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) - on_each_cpu(KCL_flush_tlb_one, &va, 1, 1); - #else - flush_tlb_page(vma, va); -@@ -2649,9 +2649,9 @@ void ATI_API_CALL __ke_put_vm_page_table(unsigned long page_addr) - static inline int ptep_clear_flush_dirty(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) - { - int ret = 0; -- -+ - DBG_ENTER("0x%08X, 0x%08X, 0x%08X->0x%08X", vma, addr, ptep, *ptep); -- -+ - if (pte_dirty(*ptep)) - { - #ifdef __x86_64__ -@@ -2666,19 +2666,19 @@ static inline int ptep_clear_flush_dirty(struct vm_area_struct *vma, unsigned lo - { - pte_update(vma->vm_mm, addr, ptep); - } --#endif -+#endif - } - - DBG_TRACE("0x%08X->0x%08X", ptep, *ptep); -- -+ - // Flush Translation Lookaside Buffers - if (ret) - { - KCL_flush_tlb_onepage(vma,addr); - } -- -+ - DBG_LEAVE("%d", ret); -- -+ - return ret; - } - #endif -@@ -2705,7 +2705,7 @@ static inline int ptep_clear_flush_dirty(struct vm_area_struct *vma, unsigned lo - * the virtual address - * - * \param mm Pointer to the memory descriptor structure -- * \param virtual_addr Virtual address -+ * \param virtual_addr Virtual address - * - * \return Old value of the "dirty" flag on success or negative on error - * -@@ -2961,7 +2961,7 @@ int ATI_API_CALL __ke_config_mtrr(void) - return 0; - #else - return 1; --#endif -+#endif - #else /* !CONFIG_MTRR */ - return 0; - #endif /* !CONFIG_MTRR */ -@@ -2987,7 +2987,7 @@ int ATI_API_CALL __ke_mtrr_del(int reg, unsigned long base, unsigned long size) - - int ATI_API_CALL __ke_has_vmap(void) - { --// We disable vmap for 2.4.x kernel to work around the big memory( > 4GB ) issue. -+// We disable vmap for 2.4.x kernel to work around the big memory( > 4GB ) issue. - #if defined(VM_MAP) || defined(vunmap) - return 1; - #else -@@ -3009,7 +3009,7 @@ int ATI_API_CALL __ke_no_iommu(void) - { - return 0; - } --#endif -+#endif - - /*****************************************************************************/ - -@@ -3066,7 +3066,7 @@ unsigned int ATI_API_CALL __ke_pci_get_func(__ke_pci_dev_t* pcidev) - { - struct pci_dev* dev = (struct pci_dev*)pcidev; - return PCI_FUNC(dev->devfn); --} -+} - - __ke_dma_addr_t ATI_API_CALL __ke_pci_map_single (__ke_pci_dev_t *pdev, void *buffer, __ke_size_t size, int direction) - { -@@ -3153,7 +3153,7 @@ static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1) - return IRQ_HANDLED; - } - #endif -- -+ - int ATI_API_CALL __ke_request_irq(unsigned int irq, - void (*ATI_API_CALL handler)(int, void *, void *), - const char *dev_name, void *dev_id) -@@ -3166,7 +3166,7 @@ int ATI_API_CALL __ke_request_irq(unsigned int irq, - SA_SHIRQ, - #else - IRQF_SHARED, --#endif -+#endif - dev_name, - dev_id); - } -@@ -3203,12 +3203,12 @@ int ATI_API_CALL __ke_agp_memory_get_page_count(struct _agp_memory* agpmem) - return (int)(agpmem->page_count); - } - --void ATI_API_CALL __ke_agp_memory_get_memory(struct _agp_memory* agpmem, -+void ATI_API_CALL __ke_agp_memory_get_memory(struct _agp_memory* agpmem, - unsigned long **memory_ptr) - { - __KE_DEBUG("[%s] agpmem=0x%016lx agpmem->memory=0x%016lx [0]=0x%016x", -- __FUNCTION__, -- (unsigned long)agpmem, -+ __FUNCTION__, -+ (unsigned long)agpmem, - (unsigned long)agpmem->memory, - (agpmem->memory)[0]); - -@@ -3217,18 +3217,9 @@ void ATI_API_CALL __ke_agp_memory_get_memory(struct _agp_memory* agpmem, - - /*****************************************************************************/ - --#ifndef NOPAGE_SIGBUS --#define NOPAGE_SIGBUS 0 --#endif /* !NOPAGE_SIGBUS */ -- - typedef struct page mem_map_t; - typedef mem_map_t *vm_nopage_ret_t; - --static __inline__ vm_nopage_ret_t do_vm_nopage(struct vm_area_struct* vma, -- unsigned long address) --{ -- return 0; /* Disallow mremap */ --} - - #ifdef __AGP__BUILTIN__ - #ifdef __ia64__ -@@ -3253,19 +3244,20 @@ static __inline__ vm_nopage_ret_t do_vm_cant_nopage(struct vm_area_struct* vma, - return page; - } - } -- return NOPAGE_SIGBUS; /* Disallow mremap */ -+ return VM_FAULT_SIGBUS; /* Disallow mremap */ - } - - #endif /* __ia64__ */ - #endif /* __AGP__BUILTIN__ */ - - --static __inline__ vm_nopage_ret_t do_vm_shm_nopage(struct vm_area_struct* vma, -- unsigned long address) -+static __inline__ int do_vm_shm_nopage(struct vm_area_struct* vma, -+ struct vm_fault *vmf) - { - pgd_t* pgd_p; - pmd_t* pmd_p; - pte_t pte; -+ unsigned long address = (unsigned long)vmf->virtual_address; - unsigned long vma_offset; - unsigned long pte_linear; - mem_map_t* pMmPage; -@@ -3294,7 +3286,7 @@ static __inline__ vm_nopage_ret_t do_vm_shm_nopage(struct vm_area_struct* vma, - (unsigned long)__ke_vm_offset(vma)); - - if (address > vma->vm_end) -- return NOPAGE_SIGBUS; /* address is out of range */ -+ return VM_FAULT_SIGBUS; /* address is out of range */ - - /* Calculate offset into VMA */ - vma_offset = address - vma->vm_start; -@@ -3306,7 +3298,7 @@ static __inline__ vm_nopage_ret_t do_vm_shm_nopage(struct vm_area_struct* vma, - pte_linear = firegl_get_addr_from_vm(vma); - if (!pte_linear) - { -- return NOPAGE_SIGBUS; /* bad address */ -+ return VM_FAULT_SIGBUS; /* bad address */ - } - pte_linear += vma_offset; - -@@ -3334,7 +3326,9 @@ static __inline__ vm_nopage_ret_t do_vm_shm_nopage(struct vm_area_struct* vma, - - // __KE_DEBUG3("vm-address 0x%08lx => kernel-page-address 0x%p\n", - // address, page_address(pMmPage)); -- return pMmPage; -+ vmf->page = pMmPage; -+ -+ return 0; - } - - /* -@@ -3343,8 +3337,10 @@ static __inline__ vm_nopage_ret_t do_vm_shm_nopage(struct vm_area_struct* vma, - (which is one ore more pages in size) - - */ --static __inline__ vm_nopage_ret_t do_vm_dma_nopage(struct vm_area_struct* vma, unsigned long address) -+static __inline__ int do_vm_dma_nopage(struct vm_area_struct* vma, -+ struct vm_fault *vmf) - { -+ unsigned long address = (unsigned long) vmf->virtual_address; - unsigned long kaddr; - mem_map_t* pMmPage; - -@@ -3360,7 +3356,7 @@ static __inline__ vm_nopage_ret_t do_vm_dma_nopage(struct vm_area_struct* vma, u - kaddr = firegl_get_addr_from_vm(vma); - if (!kaddr) - { -- return NOPAGE_SIGBUS; /* bad address */ -+ return VM_FAULT_SIGBUS; /* bad address */ - } - kaddr += (address - vma->vm_start); - -@@ -3372,19 +3368,23 @@ static __inline__ vm_nopage_ret_t do_vm_dma_nopage(struct vm_area_struct* vma, u - // with drm_alloc_pages, which marks all pages as reserved. Reserved - // pages' usage count is not decremented by the kernel during unmap!!! - // -- // For kernel >= 2.6.15, We should reenable this, because the VM sub-system -- // will decrement the pages' usage count even for the pages marked as reserved -+ // For kernel >= 2.6.15, We should reenable this, because the VM sub-system -+ // will decrement the pages' usage count even for the pages marked as reserved - // - MC. - get_page(pMmPage); /* inc usage count of page */ - #endif - - __KE_DEBUG3("vm-address 0x%08lx => kernel-page-address 0x%p\n", - address, page_address(pMmPage)); -- return pMmPage; -+ vmf->page = pMmPage; -+ -+ return 0; - } - --static __inline__ vm_nopage_ret_t do_vm_kmap_nopage(struct vm_area_struct* vma, unsigned long address) -+static __inline__ int do_vm_kmap_nopage(struct vm_area_struct* vma, -+ struct vm_fault *vmf) - { -+ unsigned long address = (unsigned long) vmf->virtual_address; - unsigned long kaddr; - mem_map_t* pMmPage; - -@@ -3394,13 +3394,14 @@ static __inline__ vm_nopage_ret_t do_vm_kmap_nopage(struct vm_area_struct* vma, - if ((pMmPage = (mem_map_t*) firegl_get_pagetable_page_from_vm(vma))) - { - get_page(pMmPage); -- return pMmPage; -+ vmf->page = pMmPage; -+ return 0; - } - - kaddr = firegl_get_addr_from_vm(vma); - if (!kaddr) - { -- return NOPAGE_SIGBUS; /* bad address */ -+ return VM_FAULT_SIGBUS; /* bad address */ - } - kaddr += (address - vma->vm_start); - -@@ -3413,50 +3414,52 @@ static __inline__ vm_nopage_ret_t do_vm_kmap_nopage(struct vm_area_struct* vma, - - __KE_DEBUG3("vm-address 0x%08lx => kernel-page-address 0x%p\n", address, page_address(pMmPage)); - -- return pMmPage; -+ vmf->page = pMmPage; -+ return 0; - } - --/** -+/** - ** -- ** This routine is intented to locate the page table through the -+ ** This routine is intented to locate the page table through the - ** pagelist table created earlier in dev-> pcie - **/ --static __inline__ vm_nopage_ret_t do_vm_pcie_nopage(struct vm_area_struct* vma, -- unsigned long address) -+static __inline__ int do_vm_pcie_nopage(struct vm_area_struct* vma, -+ struct vm_fault *vmf) - { - -+ unsigned long address = (unsigned long)vmf->virtual_address; - unsigned long vma_offset; -- unsigned long i; -+ unsigned long i; - mem_map_t* pMmPage; - struct firegl_pcie_mem* pciemem; - unsigned long* pagelist; -- -+ - drm_device_t *dev = (drm_device_t *)firegl_get_dev_from_vm(vma); - if (dev == NULL) - { - __KE_ERROR("dev is NULL\n"); -- return NOPAGE_SIGBUS; -+ return VM_FAULT_SIGBUS; - } - - if (address > vma->vm_end) - { - __KE_ERROR("address out of range\n"); -- return NOPAGE_SIGBUS; /* address is out of range */ -+ return VM_FAULT_SIGBUS; /* address is out of range */ - } - pciemem = firegl_get_pciemem_from_addr ( vma, address); - if (pciemem == NULL) - { - __KE_ERROR("No pciemem found! \n"); -- return NOPAGE_SIGBUS; -- } -+ return VM_FAULT_SIGBUS; -+ } - pagelist = firegl_get_pagelist_from_vm(vma); - -- if (pagelist == NULL) -+ if (pagelist == NULL) - { - __KE_ERROR("No pagelist! \n"); -- return NOPAGE_SIGBUS; -+ return VM_FAULT_SIGBUS; - } -- -+ - /** Find offset in vma */ - vma_offset = address - vma->vm_start; - /** Which entry in the pagelist */ -@@ -3468,15 +3471,17 @@ static __inline__ vm_nopage_ret_t do_vm_pcie_nopage(struct vm_area_struct* vma, - if (page_address(pMmPage) == 0x0) - { - __KE_ERROR("Invalid page address\n"); -- return NOPAGE_SIGBUS; -+ return VM_FAULT_SIGBUS; - } -- return pMmPage; -+ -+ vmf->page = pMmPage; -+ return 0; - } - --static __inline__ vm_nopage_ret_t do_vm_gart_nopage(struct vm_area_struct* vma, -- unsigned long address) -+static __inline__ int do_vm_gart_nopage(struct vm_area_struct* vma, -+ struct vm_fault *vmf) - { -- -+ unsigned long address = (unsigned long) vmf->virtual_address; - unsigned long page_addr; - unsigned long offset; - struct page *page; -@@ -3484,36 +3489,31 @@ static __inline__ vm_nopage_ret_t do_vm_gart_nopage(struct vm_area_struct* vma, - if (address > vma->vm_end) - { - __KE_ERROR("Invalid virtual address\n"); -- return NOPAGE_SIGBUS; /* Disallow mremap */ -- } -+ return VM_FAULT_SIGBUS; /* Disallow mremap */ -+ } - - offset = address - vma->vm_start; --#ifdef FIREGL_CF_SUPPORT -+#ifdef FIREGL_CF_SUPPORT - page_addr = mc_heap_get_page_addr(vma, offset); - #else - page_addr = firegl_cmmqs_get_pageaddr_from_vm(vma, offset); --#endif -+#endif - if( !page_addr) - { - __KE_ERROR("Invalid page address\n"); -- return NOPAGE_SIGBUS; /* Disallow mremap */ -+ return VM_FAULT_SIGBUS; /* Disallow mremap */ - } - page = virt_to_page(page_addr); - get_page(page); - -- return page; -+ vmf->page = page; -+ return 0; - } - -- -- --#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0) -- --static vm_nopage_ret_t vm_nopage(struct vm_area_struct* vma, -- unsigned long address, -- int *type) -+static int vm_nopage(struct vm_area_struct* vma, -+ struct vm_fault *vmf) - { -- if (type) *type = VM_FAULT_MINOR; -- return do_vm_nopage(vma, address); -+ return VM_FAULT_SIGBUS; - } - - #ifdef __AGP__BUILTIN__ -@@ -3545,91 +3545,10 @@ static vm_nopage_ret_t vm_cant_nopage(struct vm_area_struct* vma, - (which is one or more pages in size) - - */ --static vm_nopage_ret_t vm_shm_nopage(struct vm_area_struct* vma, -- unsigned long address, -- int *type) --{ -- if (type) *type = VM_FAULT_MINOR; -- return do_vm_shm_nopage(vma, address); --} -- --/* -- -- This routine is intended to remap addresses of a OpenGL context -- (which is one ore more pages in size) -- --*/ --static vm_nopage_ret_t vm_dma_nopage(struct vm_area_struct* vma, -- unsigned long address, -- int *type) --{ -- if (type) *type = VM_FAULT_MINOR; -- return do_vm_dma_nopage(vma, address); --} -- --static vm_nopage_ret_t vm_kmap_nopage(struct vm_area_struct* vma, -- unsigned long address, -- int *type) --{ -- if (type) *type = VM_FAULT_MINOR; -- return do_vm_kmap_nopage(vma, address); --} -- --static vm_nopage_ret_t vm_pcie_nopage(struct vm_area_struct* vma, -- unsigned long address, -- int *type) --{ -- return do_vm_pcie_nopage(vma, address); --} -- --static vm_nopage_ret_t vm_gart_nopage(struct vm_area_struct* vma, -- unsigned long address, -- int *type) --{ -- return do_vm_gart_nopage(vma, address); --} -- --#else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0) */ -- --static vm_nopage_ret_t vm_nopage(struct vm_area_struct* vma, -- unsigned long address, -- int write_access) --{ -- return do_vm_nopage(vma, address); --} -- --#ifdef __AGP__BUILTIN__ --#ifdef __ia64__ -- -- --static vm_nopage_ret_t vm_cant_nopage(struct vm_area_struct* vma, -- unsigned long address, -- int write_access) --{ -- return do_vm_cant_nopage(vma, address); --} --#endif /* __ia64__ */ --#endif /* __AGP__BUILTIN__ */ -- --/* -- -- This function is called when a page of a mmap()'ed area is not currently -- visible in the specified VMA. -- Return value is the associated physical address for the requested page. -- (If not implemented, then the kernel default routine would allocate a new, -- zeroed page for servicing us) -- -- Possible errors: SIGBUS, OutOfMem -- -- This routine is intended to remap addresses of SHM SAREA -- (which is one or more pages in size) -- -- */ --static vm_nopage_ret_t vm_shm_nopage(struct vm_area_struct* vma, -- unsigned long address, -- int write_access) -+static int vm_shm_nopage(struct vm_area_struct* vma, -+ struct vm_fault *vmf) - { -- return do_vm_shm_nopage(vma, address); -+ return do_vm_shm_nopage(vma, vmf); - } - - /* -@@ -3638,37 +3557,30 @@ static vm_nopage_ret_t vm_shm_nopage(struct vm_area_struct* vma, - (which is one ore more pages in size) - - */ --static vm_nopage_ret_t vm_dma_nopage(struct vm_area_struct* vma, -- unsigned long address, -- int write_access) -+static int vm_dma_nopage(struct vm_area_struct* vma, -+ struct vm_fault *vmf) - { -- return do_vm_dma_nopage(vma, address); -+ return do_vm_dma_nopage(vma, vmf); - } - --static vm_nopage_ret_t vm_kmap_nopage(struct vm_area_struct* vma, -- unsigned long address, -- int write_access) -+static int vm_kmap_nopage(struct vm_area_struct* vma, -+ struct vm_fault *vmf) - { -- return do_vm_kmap_nopage(vma, address); -+ return do_vm_kmap_nopage(vma, vmf); - } - --static vm_nopage_ret_t vm_pcie_nopage(struct vm_area_struct* vma, -- unsigned long address, -- int write_access) -+static int vm_pcie_nopage(struct vm_area_struct* vma, -+ struct vm_fault *vmf) - { -- return do_vm_pcie_nopage(vma, address); -+ return do_vm_pcie_nopage(vma, vmf); - } - --static vm_nopage_ret_t vm_gart_nopage(struct vm_area_struct* vma, -- unsigned long address, -- int *type) -+static int vm_gart_nopage(struct vm_area_struct* vma, -+ struct vm_fault *vmf) - { -- return do_vm_gart_nopage(vma, address); -+ return do_vm_gart_nopage(vma, vmf); - } - -- --#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0) */ -- - void* ATI_API_CALL __ke_vma_file_priv(struct vm_area_struct* vma) - { - return vma->vm_file->private_data; -@@ -3718,7 +3630,7 @@ char* ATI_API_CALL __ke_vm_page_prot_str(struct vm_area_struct* vma, char* buf) - *(buf + i++) = pgprot & _PAGE_DIRTY ? 'd' : '-'; - *(buf + i++) = pgprot & _PAGE_PSE ? 'm' : 'k'; - *(buf + i++) = pgprot & _PAGE_GLOBAL ? 'g' : 'l'; --#endif /* __i386__ */ -+#endif /* __i386__ */ - *(buf + i++) = 0; - - return buf; -@@ -3747,9 +3659,9 @@ char *__ke_pte_phys_addr_str(pte_t pte, char *buf, __ke_dma_addr_t* phys_address - return buf; - } - --char* ATI_API_CALL __ke_vm_phys_addr_str(struct vm_area_struct* vma, -- char* buf, -- unsigned long virtual_addr, -+char* ATI_API_CALL __ke_vm_phys_addr_str(struct vm_area_struct* vma, -+ char* buf, -+ unsigned long virtual_addr, - __ke_dma_addr_t* phys_address) - { - pgd_t* pgd_p; -@@ -3773,7 +3685,7 @@ void ip_drm_vm_close(struct vm_area_struct* vma) - - static struct vm_operations_struct vm_ops = - { -- nopage: vm_nopage, -+ fault: vm_nopage, - open: ip_drm_vm_open, - close: ip_drm_vm_close, - }; -@@ -3791,42 +3703,42 @@ static struct vm_operations_struct vm_cant_ops = - - static struct vm_operations_struct vm_shm_ops = - { -- nopage: vm_shm_nopage, -+ fault: do_vm_shm_nopage, - open: ip_drm_vm_open, - close: ip_drm_vm_close, - }; - - static struct vm_operations_struct vm_pci_bq_ops = - { -- nopage: vm_dma_nopage, -+ fault: vm_dma_nopage, - open: ip_drm_vm_open, - close: ip_drm_vm_close, - }; - - static struct vm_operations_struct vm_ctx_ops = - { -- nopage: vm_dma_nopage, -+ fault: vm_dma_nopage, - open: ip_drm_vm_open, - close: ip_drm_vm_close, - }; - --static struct vm_operations_struct vm_pcie_ops = -+static struct vm_operations_struct vm_pcie_ops = - { -- nopage: vm_pcie_nopage, -+ fault: vm_pcie_nopage, - open: ip_drm_vm_open, - close: ip_drm_vm_close, - }; - - static struct vm_operations_struct vm_kmap_ops = - { -- nopage: vm_kmap_nopage, -+ fault: vm_kmap_nopage, - open: ip_drm_vm_open, - close: ip_drm_vm_close, - }; - - static struct vm_operations_struct vm_gart_ops = - { -- nopage: vm_gart_nopage, -+ fault: vm_gart_nopage, - open: ip_drm_vm_open, - close: ip_drm_vm_close, - }; -@@ -3835,14 +3747,14 @@ static struct vm_operations_struct vm_gart_ops = - #ifndef __ia64__ - static struct vm_operations_struct vm_agp_bq_ops = - { -- nopage: vm_nopage, -+ fault: vm_nopage, - open: ip_drm_vm_open, - close: ip_drm_vm_close, - }; --#else -+#else - static struct vm_operations_struct vm_cant_agp_bq_ops = - { -- nopage: vm_cant_nopage, -+ fault: vm_cant_nopage, - open: ip_drm_vm_open, - close: ip_drm_vm_close, - }; -@@ -3877,19 +3789,19 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, - #ifdef __i386__ - if (boot_cpu_data.x86 > 3) - { --#ifdef FIREGL_USWC_SUPPORT -+#ifdef FIREGL_USWC_SUPPORT - if (!firegl_pat_enabled) --#endif -+#endif - { - pgprot_val(vma->vm_page_prot) |= _PAGE_PCD; - pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT; - } --#ifdef FIREGL_USWC_SUPPORT -+#ifdef FIREGL_USWC_SUPPORT - else - { - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); -- } --#endif -+ } -+#endif - } - #endif /* __i386__ */ - #ifdef __ia64__ -@@ -3908,7 +3820,7 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, - } - break; - --#ifdef FIREGL_USWC_SUPPORT -+#ifdef FIREGL_USWC_SUPPORT - case __KE_ADPT_REG: - { - #ifdef __ia64__ -@@ -3928,7 +3840,7 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, - } - else - { -- vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); -+ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); - } - } - #endif /* __i386__ */ -@@ -3947,7 +3859,7 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, - vma->vm_ops = &vm_ops; - } - break; --#endif -+#endif - - case __KE_SHM: - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -@@ -3981,7 +3893,7 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, - - #ifdef __AGP__BUILTIN__ - case __KE_AGP: -- // if(dev->agp->cant_use_aperture == 1) -+ // if(dev->agp->cant_use_aperture == 1) - #ifdef __ia64__ - { - /* -@@ -4005,9 +3917,9 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, - if( firegl_pat_enabled ) - { - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); -- } -+ } - } --#endif -+#endif - - if (REMAP_PAGE_RANGE(vma,offset)) - { -@@ -4024,8 +3936,8 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, - #endif - break; - case __KE_AGP_BQS: -- // if(dev->agp->cant_use_aperture == 1) --#ifdef __ia64__ -+ // if(dev->agp->cant_use_aperture == 1) -+#ifdef __ia64__ - { - /* - * On some systems we can't talk to bus dma address from -@@ -4048,9 +3960,9 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, - if( firegl_pat_enabled ) - { - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); -- } -+ } - } --#endif -+#endif - - if (REMAP_PAGE_RANGE(vma,offset)) - { -@@ -4079,15 +3991,15 @@ int ATI_API_CALL __ke_vm_map(struct file* filp, - break; - - case __KE_GART_USWC: --#ifdef FIREGL_USWC_SUPPORT -+#ifdef FIREGL_USWC_SUPPORT - if (boot_cpu_data.x86 > 3) - { - if( firegl_pat_enabled ) - { - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); -- } -+ } - } --#endif -+#endif - // fall through - case __KE_GART_CACHEABLE: - vma->vm_flags |= VM_RESERVED; -@@ -4137,7 +4049,7 @@ extern struct _agp_memory *_X(agp_allocate_memory_phys_list)(size_t, u32, u64 *) - #define FIREGL_agp_backend_release _X(agp_backend_release) - #define FIREGL_agp_memory _X(agp_memory) - --unsigned int __ke_firegl_agpgart_inuse = AGPGART_INUSE_NONE; -+unsigned int __ke_firegl_agpgart_inuse = AGPGART_INUSE_NONE; - - #if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) - /*****************************************************************************/ -@@ -4252,7 +4164,7 @@ static - int ATI_API_CALL __ke_agpgart_available(__ke_pci_dev_t *pcidev, int use_internal) - { - drm_agp_module_stub = &drm_agp; -- __ke_firegl_agpgart_inuse = KERNEL26_AGPGART_INUSE; -+ __ke_firegl_agpgart_inuse = KERNEL26_AGPGART_INUSE; - { - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) - firegl_pci_device = (struct pci_dev*)(void*)pcidev; -@@ -4305,7 +4217,7 @@ int ATI_API_CALL __ke_agp_available(__ke_pci_dev_t *pcidev, int use_internal) - } else { - available = __ke_firegl_agpgart_available(); - } -- -+ - return available; - } - -@@ -4410,7 +4322,7 @@ void ATI_API_CALL __ke_agp_copy_info(__ke_agp_kern_info_t* info) - - if (AGP_AVAILABLE(copy_info)) - { -- struct agp_kern_info kern; -+ struct agp_kern_info kern; - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) - if (firegl_agp_bridge == NULL) -@@ -4508,7 +4420,7 @@ int ATI_API_CALL __ke_agp_enable(unsigned long mode) - - int ATI_API_CALL __ke_read_agp_caps_registers(__ke_pci_dev_t* dev, unsigned int *caps) - { -- return -EINVAL; -+ return -EINVAL; - } - - int ATI_API_CALL __ke_agp_acquire(__ke_pci_dev_t* dev) -@@ -4550,9 +4462,9 @@ int ATI_API_CALL __ke_smp_processor_id(void) - - /** \brief Runs a function on all other CPUs - * \param func_to_call function to be called on all other cpus -- * \return None -+ * \return None - */ --void ATI_API_CALL KCL_CallFuncOnOtherCpus(firegl_void_routine_t func_to_call) -+void ATI_API_CALL KCL_CallFuncOnOtherCpus(firegl_void_routine_t func_to_call) - { - #ifdef CONFIG_SMP - smp_call_function( firegl_smp_func_parameter_wrap, (void*)func_to_call, 0, 1 ); -@@ -4659,7 +4571,7 @@ int ATI_API_CALL __ke_has_PSE(void) - - int ATI_API_CALL KCL_is_pat_enabled(void) - { -- return firegl_pat_enabled; -+ return firegl_pat_enabled; - } - - static int ATI_API_CALL KCL_has_pat(void) -@@ -4675,7 +4587,7 @@ static void KCL_setup_pat(void *info) - { - unsigned long cr0=0, cr4=0; - unsigned long flags; -- -+ - local_irq_save(flags); - cr0 = read_cr0() | 0x40000000; - write_cr0(cr0); -@@ -4706,7 +4618,7 @@ static void KCL_restore_pat(void *info) - { - unsigned long cr0 = 0, cr4 = 0; - unsigned long flags; -- -+ - local_irq_save(flags); - cr0 = read_cr0() | 0x40000000; - write_cr0(cr0); -@@ -4718,7 +4630,7 @@ static void KCL_restore_pat(void *info) - write_cr4(cr4 & ~X86_CR4_PGE); - } - __flush_tlb(); -- -+ - wrmsr(MSR_IA32_CR_PAT, KCL_orig_pat[0], KCL_orig_pat[1]); - - cr0 = read_cr0(); -@@ -4741,7 +4653,7 @@ static int ATI_API_CALL KCL_enable_pat(void) - __KE_INFO("USWC is disabled in module parameters\n"); - return 0; - } -- -+ - if (!KCL_has_pat()) - { - return 0; -@@ -4751,13 +4663,13 @@ static int ATI_API_CALL KCL_enable_pat(void) - - for ( i = 0; i < 2; i++ ) - { -- for (j = 0; j < 4; j ++) -+ for (j = 0; j < 4; j ++) - { - if (((KCL_orig_pat[i] >> (j * 8)) & 0xFF) == 1) -- { -+ { - __KE_ERROR("Pat entry %d is already configured\n", (i+1)*(j+1)); - return 0; -- } -+ } - } - } - -@@ -4829,7 +4741,7 @@ typedef struct tag_kasContext_t - } kasContext_t; - - /** \brief KAS context */ --static kasContext_t kasContext; -+static kasContext_t kasContext; - - /** \brief Kernel support required to enable KAS */ - #if defined(cmpxchg) && \ -@@ -5137,7 +5049,7 @@ unsigned int ATI_API_CALL KAS_Ih_Execute(KAS_IhRoutine_t ih_routine, - DBG_TRACE("Interrupt handler returned 0x%08X", ret); - - kasSetExecutionLevel(orig_level); -- spin_unlock(&kasContext.lock_ih); -+ spin_unlock(&kasContext.lock_ih); - - DBG_LEAVE("%d", ret); - return ret; -@@ -5412,7 +5324,7 @@ typedef struct tag_kasSlabCache_t - #endif - spinlock_t lock; /* OS spinlock object protecting the cache */ - unsigned int routine_type; /* Type of routine the cache might be accessed from */ -- char name[14]; /* Cache object name (kernel 2.4 restricts its length to 19 chars) */ -+ char name[24]; /* Cache object name (kernel 2.4 restricts its length to 19 chars) */ - } kasSlabCache_t; - - /** \brief Return Slab Cache object size -@@ -5450,7 +5362,8 @@ unsigned int ATI_API_CALL KAS_SlabCache_Initialize(void* hSlabCache, - - slabcache_obj->routine_type = access_type; - spin_lock_init(&(slabcache_obj->lock)); -- sprintf(slabcache_obj->name, "kas(%08lX)",(unsigned long)slabcache_obj); -+ snprintf(slabcache_obj->name, sizeof(slabcache_obj->name), -+ "kas(%p)", slabcache_obj); - - DBG_TRACE("creating slab object '%s'", slabcache_obj->name); - -@@ -6366,7 +6279,7 @@ unsigned int ATI_API_CALL KAS_AtomicAddInt( - - kas_xadd(puiDestination, iAdd, ret, "l"); - -- return ret + iAdd; -+ return ret + iAdd; - #else - return 0xDEADC0DE; /* To make compiler happy */ - #endif -@@ -6449,7 +6362,7 @@ long ATI_API_CALL KAS_ScheduleTimeout(long n_jiffies) - #ifdef FIREGL_CF_SUPPORT - - void *ATI_API_CALL KCL_lock_init() --{ -+{ - spinlock_t *lock; - - lock = kmalloc(sizeof(*lock), GFP_KERNEL); -@@ -6461,7 +6374,7 @@ void *ATI_API_CALL KCL_lock_init() - } - - void ATI_API_CALL KCL_lock_deinit(void *plock) --{ -+{ - if (plock == NULL) - { - __KE_ERROR("plock is NULL\n"); diff --git a/x11-drivers/ati-drivers/files/0005-Linux-2.6.26.x-kernels-firegl_public.h.patch b/x11-drivers/ati-drivers/files/0005-Linux-2.6.26.x-kernels-firegl_public.h.patch deleted file mode 100644 index a9fa63e..0000000 --- a/x11-drivers/ati-drivers/files/0005-Linux-2.6.26.x-kernels-firegl_public.h.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.h -+++ common/lib/modules/fglrx/build_mod/firegl_public.h -@@ -78,7 +78,7 @@ - if (!pgd_present(*(pgd_p))) \ - { \ - __KE_ERROR("FATAL ERROR: User queue buffer not present! (pgd)\n"); \ -- return (unsigned long)NOPAGE_SIGBUS; /* Something bad happened; generate SIGBUS */ \ -+ return VM_FAULT_SIGBUS; /* Something bad happened; generate SIGBUS */ \ - /* alternatively we could generate a NOPAGE_OOM "out of memory" */ \ - } \ - } while(0) -@@ -91,7 +91,7 @@ - if (!pud_present(*(pud_p))) \ - { \ - __KE_ERROR("FATAL ERROR: User queue buffer not present! (pud)\n"); \ -- return (unsigned long)NOPAGE_SIGBUS; /* Something bad happened; generate SIGBUS */ \ -+ return VM_FAULT_SIGBUS; /* Something bad happened; generate SIGBUS */ \ - /* alternatively we could generate a NOPAGE_OOM "out of memory" */ \ - } \ - pmd_p = pmd_offset(pud_p, pte_linear); \ -@@ -111,7 +111,7 @@ - if (!pmd_present(*(pmd_p))) \ - { \ - __KE_ERROR("FATAL ERROR: User queue buffer not present! (pmd)\n"); \ -- return (unsigned long)NOPAGE_SIGBUS; /* Something bad happened; generate SIGBUS */ \ -+ return VM_FAULT_SIGBUS; /* Something bad happened; generate SIGBUS */ \ - /* alternatively we could generate a NOPAGE_OOM "out of memory" */ \ - } \ - } while(0) -@@ -157,7 +157,7 @@ - if (!pte_present(pte)) \ - { \ - __KE_ERROR("FATAL ERROR: User queue buffer not present! (pte)\n"); \ -- return (unsigned long)NOPAGE_SIGBUS; /* Something bad happened; generate SIGBUS */ \ -+ return VM_FAULT_SIGBUS; /* Something bad happened; generate SIGBUS */ \ - /* alternatively we could generate a NOPAGE_OOM "out of memory" */ \ - } \ - } while(0) diff --git a/x11-drivers/ati-drivers/files/09ati b/x11-drivers/ati-drivers/files/09ati deleted file mode 100644 index 27180e0..0000000 --- a/x11-drivers/ati-drivers/files/09ati +++ /dev/null @@ -1,3 +0,0 @@ -PATH=/opt/ati/bin -ROOTPATH=/opt/ati/bin:/opt/ati/sbin -MANPATH=/opt/ati/man diff --git a/x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch b/x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch deleted file mode 100644 index 25d5883..0000000 --- a/x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- common-orig/lib/modules/fglrx/build_mod/firegl_public.c 2007-08-01 16:58:40.000000000 -0500 -+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-08-01 16:57:11.000000000 -0500 -@@ -144,12 +144,14 @@ - #define EXPORT_NO_SYMBOLS - #endif - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) - #ifdef __x86_64__ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) - #include "linux/ioctl32.h" - #else - #include "asm/ioctl32.h" - #endif -+#endif - - #ifdef __x86_64__ - #include "asm/compat.h" diff --git a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch b/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch deleted file mode 100644 index 9713208..0000000 --- a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Naur common/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c ---- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-07-29 13:36:37.000000000 +0200 -+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-07-29 14:24:11.000000000 +0200 -@@ -2409,7 +2409,11 @@ - #ifdef pte_offset_map - pte_p = pte_offset_map(pmd_p, virtual_addr); - if (pte_present(*pte_p)) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) - ret = (ptep_clear_flush_dirty(vma, virtual_addr, pte_p) ? 1 : 0); -+#else -+ return 0; -+#endif - else - __KE_DEBUG("page not exists!\n"); - pte_unmap(pte_p); -@@ -3399,9 +3403,11 @@ - sprintf(buf, "0x%Lx %c%c%c%c%c%c\n", - *phys_address, - pte_present (pte) ? 'p' : '-', -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) - pte_read (pte) ? 'r' : '-', -- pte_write (pte) ? 'w' : '-', - pte_exec (pte) ? 'x' : '-', -+#endif -+ pte_write (pte) ? 'w' : '-', - pte_dirty (pte) ? 'd' : '-', - pte_young (pte) ? 'a' : '-'); - } -@@ -5348,7 +5354,11 @@ - DBG_TRACE("creating slab object '%s'", slabcache_obj->name); - - if ((slabcache_obj->cache = -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) - kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL, NULL))) -+#else -+ kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL))) -+#endif - { - ret = 1; - } - diff --git a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch b/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch deleted file mode 100644 index 378435d..0000000 --- a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -Naur common/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c ---- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-07-29 13:36:37.000000000 +0200 -+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-07-29 14:24:11.000000000 +0200 -@@ -452,7 +452,7 @@ - } - - static unsigned int --firegl_interrupt_poll_wrap(struct file *user_file, poll_table *pt) -+firegl_interrupt_poll_wrap(struct file *user_file, struct poll_table_struct *pt) - { - if(firegl_interrupt_poll(user_file, (__ke_poll_table*)pt)) - { -@@ -1491,7 +1491,8 @@ - int ATI_API_CALL firegl_put_user_ptr(void *src, u32 *dst) - { - void *temp = src; -- return put_user(temp, dst); -+ void *dst_temp = dst; -+ return put_user(temp, dst_temp); - } - - int ATI_API_CALL firegl_put_user_u16(u16 src, u16 *dst) -@@ -1883,7 +1884,7 @@ - - __ke_pci_dev_t* ATI_API_CALL __ke_pci_find_device (unsigned int vendor, unsigned int dev, __ke_pci_dev_t* from) - { -- return (__ke_pci_dev_t*)pci_find_device( vendor, dev, (struct pci_dev *)(void *)from ); -+ return (__ke_pci_dev_t*) pci_get_device(vendor, dev, (struct pci_dev *)(void *) from); - } - - void* ATI_API_CALL __ke_malloc(__ke_size_t size) -@@ -2813,9 +2814,9 @@ - #else - static void ATI_API_CALL (*irq_handler_func)(int, void*, void*); /* function pointer variable */ - --static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1, struct pt_regs *regs) -+static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1) - { -- irq_handler_func(irq, arg1, regs); -+ irq_handler_func(irq, arg1, NULL); - return IRQ_HANDLED; - } - -@@ -2826,7 +2827,7 @@ - irq_handler_func = handler; - return request_irq(irq, - ke_irq_handler_wrap, -- SA_SHIRQ, dev_name, dev_id); -+ IRQF_SHARED, dev_name, dev_id); - } - - void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id) -@@ -2848,9 +2849,7 @@ - - void ATI_API_CALL __ke_unregister_ioctl32_conversion(unsigned int cmd) - { --#ifdef FIREGL_IOCTL_COMPAT -- return 0; --#else -+#ifndef FIREGL_IOCTL_COMPAT - unregister_ioctl32_conversion(cmd); - #endif - } -@@ -4353,7 +4352,7 @@ - void ATI_API_CALL KCL_CallFuncOnOtherCpus(firegl_void_routine_t func_to_call) - { - #ifdef CONFIG_SMP -- smp_call_function( firegl_smp_func_parameter_wrap, (void*)func_to_call, 0, 1 ); -+ smp_call_function( (void (*)(void *info)) func_to_call, NULL, 0, 1 ); - #endif - } - -@@ -5303,7 +5302,7 @@ - /** \brief Type definition of the structure describing Slab Cache object */ - typedef struct tag_kasSlabCache_t - { -- kmem_cache_t* cache; /* OS slab cache object */ -+ struct kmem_cache* cache; /* OS slab cache object */ - spinlock_t lock; /* OS spinlock object protecting the cache */ - unsigned int routine_type; /* Type of routine the cache might be accessed from */ - char name[14]; /* Cache object name (kernel 2.4 restricts its length to 19 chars) */ -@@ -5344,7 +5343,7 @@ - - slabcache_obj->routine_type = access_type; - spin_lock_init(&(slabcache_obj->lock)); -- sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)slabcache_obj); -+ sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)(long unsigned int)slabcache_obj); - - DBG_TRACE("creating slab object '%s'", slabcache_obj->name); - diff --git a/x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch b/x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch deleted file mode 100644 index 88b89a8..0000000 --- a/x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh ---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 -@@ -17,6 +17,10 @@ - fi - } - -+aticonfig='/opt/bin/aticonfig' -+ -+# default high power state -+default_state=`$aticonfig --lsp | grep 'default state' | cut -c 3` - - grep -q closed /proc/acpi/button/lid/*/state - if [ $? = 0 ]; then -@@ -46,7 +50,7 @@ - getXuser; - if [ x"$XAUTHORITY" != x"" ]; then - export DISPLAY=":$displaynum" -- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=1 --effective=now" - fi - done - else -@@ -56,7 +60,7 @@ - getXuser; - if [ x"$XAUTHORITY" != x"" ]; then - export DISPLAY=":$displaynum" -- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=$default_state --effective=now" - fi - done - fi - diff --git a/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch deleted file mode 100644 index 3819b23..0000000 --- a/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh-orig 2007-12-23 22:48:55.873089378 -0600 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2007-12-23 22:49:59.246421379 -0600 -@@ -4,6 +4,8 @@ - # Control script for ACPI lid state and AC adapter state - # - -+aticonfig='/opt/bin/aticonfig' -+ - getXuser() { - user=`who| grep -m1 ":$displaynum " | awk '{print $1}'` - if [ x"$user" = x"" ]; then -@@ -47,7 +49,7 @@ - done - - #If PPLIB is enabled --su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB -+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB - if [ $? = 0 ]; then - echo "Has PPLIB" - has_pplib=1 -@@ -61,15 +63,15 @@ - if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then - echo "Low power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=1" - fi - else - echo "high power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" - fi - fi diff --git a/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch deleted file mode 100644 index f5a35a3..0000000 --- a/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh ---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 -@@ -4,6 +4,8 @@ - # Control script for ACPI lid state and AC adapter state - # - -+aticonfig='/opt/bin/aticonfig' -+ - getXuser() { - user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` - if [ x"$user" = x"" ]; then -@@ -47,7 +49,7 @@ - done - - #If PPLIB is enabled --su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB -+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB - if [ $? = 0 ]; then - echo "Has PPLIB" - has_pplib=1 -@@ -61,15 +63,15 @@ - if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then - echo "Low power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=1" - fi - else - echo "high power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" - fi - fi - diff --git a/x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch deleted file mode 100644 index f5a35a3..0000000 --- a/x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh ---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 -@@ -4,6 +4,8 @@ - # Control script for ACPI lid state and AC adapter state - # - -+aticonfig='/opt/bin/aticonfig' -+ - getXuser() { - user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` - if [ x"$user" = x"" ]; then -@@ -47,7 +49,7 @@ - done - - #If PPLIB is enabled --su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB -+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB - if [ $? = 0 ]; then - echo "Has PPLIB" - has_pplib=1 -@@ -61,15 +63,15 @@ - if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then - echo "Low power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=1" - fi - else - echo "high power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" - fi - fi - diff --git a/x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch deleted file mode 100644 index f5a35a3..0000000 --- a/x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh ---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 -@@ -4,6 +4,8 @@ - # Control script for ACPI lid state and AC adapter state - # - -+aticonfig='/opt/bin/aticonfig' -+ - getXuser() { - user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` - if [ x"$user" = x"" ]; then -@@ -47,7 +49,7 @@ - done - - #If PPLIB is enabled --su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB -+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB - if [ $? = 0 ]; then - echo "Has PPLIB" - has_pplib=1 -@@ -61,15 +63,15 @@ - if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then - echo "Low power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=1" - fi - else - echo "high power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" - fi - fi - diff --git a/x11-drivers/ati-drivers/files/8.476/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.476/ati-powermode-opt-path-2.patch deleted file mode 100644 index f5a35a3..0000000 --- a/x11-drivers/ati-drivers/files/8.476/ati-powermode-opt-path-2.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh ---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 -@@ -4,6 +4,8 @@ - # Control script for ACPI lid state and AC adapter state - # - -+aticonfig='/opt/bin/aticonfig' -+ - getXuser() { - user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` - if [ x"$user" = x"" ]; then -@@ -47,7 +49,7 @@ - done - - #If PPLIB is enabled --su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB -+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB - if [ $? = 0 ]; then - echo "Has PPLIB" - has_pplib=1 -@@ -61,15 +63,15 @@ - if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then - echo "Low power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=1" - fi - else - echo "high power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" - fi - fi - diff --git a/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch deleted file mode 100644 index f5a35a3..0000000 --- a/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh ---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 -@@ -4,6 +4,8 @@ - # Control script for ACPI lid state and AC adapter state - # - -+aticonfig='/opt/bin/aticonfig' -+ - getXuser() { - user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` - if [ x"$user" = x"" ]; then -@@ -47,7 +49,7 @@ - done - - #If PPLIB is enabled --su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB -+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB - if [ $? = 0 ]; then - echo "Has PPLIB" - has_pplib=1 -@@ -61,15 +63,15 @@ - if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then - echo "Low power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=1" - fi - else - echo "high power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" - fi - fi - diff --git a/x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch b/x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch deleted file mode 100644 index 2a2a4f2..0000000 --- a/x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- firegl_public.c 2008-09-19 10:57:09.000000000 +0200 -+++ firegl_public.c 2008-09-19 10:55:57.000000000 +0200 -@@ -199,6 +199,12 @@ - #define preempt_enable() - #endif - -+/* Since 2.6.27 smp_call_function doesn't have a nonatomic/retry argument */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) -+#define SMP_CALL_FUNCTION(func, info, retry, wait) smp_call_function(func, info, wait) -+#else -+#define SMP_CALL_FUNCTION(func, info, retry, wait) smp_call_function(func, info, retry, wait) -+#endif - // ============================================================ - /* globals */ - -@@ -250,7 +256,7 @@ - const char BUILD_KERNEL_HAS_MODVERSIONS_CLEARED; - #endif - --#ifdef __SMP__ -+#ifdef CONFIG_SMP - const unsigned long __ke_SMP_State = 1; - const char BUILD_KERNEL_HAS_SMP_SET; - #else -@@ -2516,8 +2522,8 @@ - { - /*Some kernel developer removed the export of symbol "flush_tlb_page" on 2.6.25 x86_64 SMP kernel. - Define a simple version here.*/ --#if defined(__x86_64__) && defined(__SMP__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) -- on_each_cpu(KCL_flush_tlb_one, &va, 1, 1); -+#if defined(__x86_64__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) -+ on_each_cpu(KCL_flush_tlb_one, &va, 1); - #else - flush_tlb_page(vma, va); - #endif -@@ -2902,7 +2908,7 @@ - - /*****************************************************************************/ - --#ifdef __SMP__ -+#ifdef CONFIG_SMP - static atomic_t cpus_waiting; - - static void deferred_flush(void* contextp) -@@ -2918,13 +2924,13 @@ - while (atomic_read(&cpus_waiting) > 0) - barrier(); - } --#endif /* __SMP__ */ -+#endif /* CONFIG_SMP */ - - int ATI_API_CALL __ke_flush_cache(void) - { --#ifdef __SMP__ -+#ifdef CONFIG_SMP - /* write back invalidate all other CPUs (exported by kernel) */ -- if (smp_call_function(deferred_flush, NULL, 1, 0) != 0) -+ if (SMP_CALL_FUNCTION(deferred_flush, NULL, 1, 0) != 0) - panic("timed out waiting for the other CPUs!\n"); - - /* invalidate this CPU */ -@@ -2938,7 +2944,7 @@ - - while (atomic_read(&cpus_waiting) > 0) - barrier(); --#else /* !__SMP__ */ -+#else /* !CONFIG_SMP */ - #if defined(__i386__) || defined(__x86_64__) - asm volatile ("wbinvd":::"memory"); - #elif defined(__alpha__) || defined(__sparc__) -@@ -2946,7 +2952,7 @@ - #else - #error "Please define flush_cache for your architecture." - #endif --#endif /* !__SMP__ */ -+#endif /* !CONFIG_SMP */ - - //for kernel 2.6.25, tlb_flush has been included when calling set_pages_*. - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) -@@ -4654,7 +4660,7 @@ - } - - #ifdef CONFIG_SMP -- if (smp_call_function(KCL_setup_pat, NULL, 0, 1) != 0) -+ if (SMP_CALL_FUNCTION(KCL_setup_pat, NULL, 0, 1) != 0) - return 0; - #endif - KCL_setup_pat(NULL); -@@ -4673,7 +4679,7 @@ - } - - #ifdef CONFIG_SMP -- if (smp_call_function(KCL_restore_pat, NULL, 0, 1) != 0) -+ if (SMP_CALL_FUNCTION(KCL_restore_pat, NULL, 0, 1) != 0) - return; - #endif - KCL_restore_pat(NULL); diff --git a/x11-drivers/ati-drivers/files/8.552/ati-drivers-xen-8.552.patch b/x11-drivers/ati-drivers/files/8.552/ati-drivers-xen-8.552.patch deleted file mode 100644 index a1b88df..0000000 --- a/x11-drivers/ati-drivers/files/8.552/ati-drivers-xen-8.552.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:17:27.000000000 +0000 -+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:12:34.000000000 +0000 -@@ -31,6 +31,9 @@ - #include - - #if !defined(CONFIG_X86_PC) -+#if !defined(CONFIG_X86_PC_XEN) -+#if !defined(CONFIG_X86_XEN) -+#if !defined(CONFIG_X86_64_XEN) - #if !defined(CONFIG_X86_64) - #if !defined(CONFIG_X86_VOYAGER) - #if !defined(CONFIG_X86_NUMAQ) -@@ -47,6 +50,9 @@ - #endif - #endif - #endif -+#endif -+#endif -+#endif - - /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines - * a static inline function that uses a GPL-only symbol in a header ---- common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:17:27.000000000 +0000 -+++ common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:15:45.000000000 +0000 -@@ -30,9 +30,13 @@ - #endif - - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) -- -+#ifdef CONFIG_XEN -+#define REMAP_PAGE_RANGE_FN io_remap_pfn_range -+#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range" -+#else - #define REMAP_PAGE_RANGE_FN remap_pfn_range - #define REMAP_PAGE_RANGE_STR "remap_pfn_range" -+#endif - #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT) - - #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */ -@@ -43,13 +47,21 @@ - - #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */ - -+#ifdef CONFIG_XEN -+#define REMAP_PAGE_RANGE(vma,offset) \ -+ REMAP_PAGE_RANGE_FN((vma), \ -+ (vma)->vm_start, \ -+ REMAP_PAGE_RANGE_OFF(offset), \ -+ (vma)->vm_end - (vma)->vm_start, \ -+ (vma)->vm_page_prot) -+#else - #define REMAP_PAGE_RANGE(vma,offset) \ - REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \ - (vma)->vm_start, \ - REMAP_PAGE_RANGE_OFF(offset), \ - (vma)->vm_end - (vma)->vm_start, \ - (vma)->vm_page_prot) -- -+#endif - - /* Page table macros */ - diff --git a/x11-drivers/ati-drivers/files/8.573/ati-drivers-xen-8.552.patch b/x11-drivers/ati-drivers/files/8.573/ati-drivers-xen-8.552.patch deleted file mode 100644 index a1b88df..0000000 --- a/x11-drivers/ati-drivers/files/8.573/ati-drivers-xen-8.552.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:17:27.000000000 +0000 -+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:12:34.000000000 +0000 -@@ -31,6 +31,9 @@ - #include - - #if !defined(CONFIG_X86_PC) -+#if !defined(CONFIG_X86_PC_XEN) -+#if !defined(CONFIG_X86_XEN) -+#if !defined(CONFIG_X86_64_XEN) - #if !defined(CONFIG_X86_64) - #if !defined(CONFIG_X86_VOYAGER) - #if !defined(CONFIG_X86_NUMAQ) -@@ -47,6 +50,9 @@ - #endif - #endif - #endif -+#endif -+#endif -+#endif - - /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines - * a static inline function that uses a GPL-only symbol in a header ---- common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:17:27.000000000 +0000 -+++ common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:15:45.000000000 +0000 -@@ -30,9 +30,13 @@ - #endif - - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) -- -+#ifdef CONFIG_XEN -+#define REMAP_PAGE_RANGE_FN io_remap_pfn_range -+#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range" -+#else - #define REMAP_PAGE_RANGE_FN remap_pfn_range - #define REMAP_PAGE_RANGE_STR "remap_pfn_range" -+#endif - #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT) - - #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */ -@@ -43,13 +47,21 @@ - - #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */ - -+#ifdef CONFIG_XEN -+#define REMAP_PAGE_RANGE(vma,offset) \ -+ REMAP_PAGE_RANGE_FN((vma), \ -+ (vma)->vm_start, \ -+ REMAP_PAGE_RANGE_OFF(offset), \ -+ (vma)->vm_end - (vma)->vm_start, \ -+ (vma)->vm_page_prot) -+#else - #define REMAP_PAGE_RANGE(vma,offset) \ - REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \ - (vma)->vm_start, \ - REMAP_PAGE_RANGE_OFF(offset), \ - (vma)->vm_end - (vma)->vm_start, \ - (vma)->vm_page_prot) -- -+#endif - - /* Page table macros */ - diff --git a/x11-drivers/ati-drivers/files/8.573/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.573/ati-powermode-opt-path-2.patch deleted file mode 100644 index f5a35a3..0000000 --- a/x11-drivers/ati-drivers/files/8.573/ati-powermode-opt-path-2.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh ---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 -@@ -4,6 +4,8 @@ - # Control script for ACPI lid state and AC adapter state - # - -+aticonfig='/opt/bin/aticonfig' -+ - getXuser() { - user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` - if [ x"$user" = x"" ]; then -@@ -47,7 +49,7 @@ - done - - #If PPLIB is enabled --su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB -+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB - if [ $? = 0 ]; then - echo "Has PPLIB" - has_pplib=1 -@@ -61,15 +63,15 @@ - if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then - echo "Low power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=1" - fi - else - echo "high power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" - fi - fi - diff --git a/x11-drivers/ati-drivers/files/8.582/ati-drivers-xen-8.552.patch b/x11-drivers/ati-drivers/files/8.582/ati-drivers-xen-8.552.patch deleted file mode 100644 index a1b88df..0000000 --- a/x11-drivers/ati-drivers/files/8.582/ati-drivers-xen-8.552.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:17:27.000000000 +0000 -+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:12:34.000000000 +0000 -@@ -31,6 +31,9 @@ - #include - - #if !defined(CONFIG_X86_PC) -+#if !defined(CONFIG_X86_PC_XEN) -+#if !defined(CONFIG_X86_XEN) -+#if !defined(CONFIG_X86_64_XEN) - #if !defined(CONFIG_X86_64) - #if !defined(CONFIG_X86_VOYAGER) - #if !defined(CONFIG_X86_NUMAQ) -@@ -47,6 +50,9 @@ - #endif - #endif - #endif -+#endif -+#endif -+#endif - - /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines - * a static inline function that uses a GPL-only symbol in a header ---- common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:17:27.000000000 +0000 -+++ common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:15:45.000000000 +0000 -@@ -30,9 +30,13 @@ - #endif - - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) -- -+#ifdef CONFIG_XEN -+#define REMAP_PAGE_RANGE_FN io_remap_pfn_range -+#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range" -+#else - #define REMAP_PAGE_RANGE_FN remap_pfn_range - #define REMAP_PAGE_RANGE_STR "remap_pfn_range" -+#endif - #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT) - - #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */ -@@ -43,13 +47,21 @@ - - #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */ - -+#ifdef CONFIG_XEN -+#define REMAP_PAGE_RANGE(vma,offset) \ -+ REMAP_PAGE_RANGE_FN((vma), \ -+ (vma)->vm_start, \ -+ REMAP_PAGE_RANGE_OFF(offset), \ -+ (vma)->vm_end - (vma)->vm_start, \ -+ (vma)->vm_page_prot) -+#else - #define REMAP_PAGE_RANGE(vma,offset) \ - REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \ - (vma)->vm_start, \ - REMAP_PAGE_RANGE_OFF(offset), \ - (vma)->vm_end - (vma)->vm_start, \ - (vma)->vm_page_prot) -- -+#endif - - /* Page table macros */ - diff --git a/x11-drivers/ati-drivers/files/8.582/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.582/ati-powermode-opt-path-2.patch deleted file mode 100644 index f5a35a3..0000000 --- a/x11-drivers/ati-drivers/files/8.582/ati-powermode-opt-path-2.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh ---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 -@@ -4,6 +4,8 @@ - # Control script for ACPI lid state and AC adapter state - # - -+aticonfig='/opt/bin/aticonfig' -+ - getXuser() { - user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` - if [ x"$user" = x"" ]; then -@@ -47,7 +49,7 @@ - done - - #If PPLIB is enabled --su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB -+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB - if [ $? = 0 ]; then - echo "Has PPLIB" - has_pplib=1 -@@ -61,15 +63,15 @@ - if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then - echo "Low power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=1" - fi - else - echo "high power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" - fi - fi - diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch deleted file mode 100644 index 160565a..0000000 --- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/agp3.c fglrx-install/common/lib/modules/fglrx/build_mod/agp3.c ---- fglrx-install-old/common/lib/modules/fglrx/build_mod/agp3.c 2006-09-19 19:30:42.000000000 -0500 -+++ fglrx-install/common/lib/modules/fglrx/build_mod/agp3.c 2006-10-27 09:44:23.902749464 -0500 -@@ -61,7 +61,6 @@ - #include - #endif - #endif --#include - #include - #include - #include -diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/agpgart_be.c fglrx-install/common/lib/modules/fglrx/build_mod/agpgart_be.c ---- fglrx-install-old/common/lib/modules/fglrx/build_mod/agpgart_be.c 2006-09-19 19:30:42.000000000 -0500 -+++ fglrx-install/common/lib/modules/fglrx/build_mod/agpgart_be.c 2006-10-27 09:44:34.265174136 -0500 -@@ -99,9 +99,6 @@ - #endif - #endif - --#include -- -- - #include - #include - #include -diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/drm.h fglrx-install/common/lib/modules/fglrx/build_mod/drm.h ---- fglrx-install-old/common/lib/modules/fglrx/build_mod/drm.h 2006-09-19 19:30:42.000000000 -0500 -+++ fglrx-install/common/lib/modules/fglrx/build_mod/drm.h 2006-10-27 09:44:52.502401656 -0500 -@@ -38,7 +38,6 @@ - #define _DRM_H_ - - #if defined(__linux__) --#include - #include /* For _IO* macros */ - #define DRM_IOCTL_NR(n) _IOC_NR(n) - #define DRM_IOC_VOID _IOC_NONE -diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/drmP.h fglrx-install/common/lib/modules/fglrx/build_mod/drmP.h ---- fglrx-install-old/common/lib/modules/fglrx/build_mod/drmP.h 2006-09-19 19:30:42.000000000 -0500 -+++ fglrx-install/common/lib/modules/fglrx/build_mod/drmP.h 2006-10-27 09:45:03.912667032 -0500 -@@ -42,7 +42,6 @@ - * can build the DRM (part of PI DRI). 4/21/2000 S + B */ - #include - #endif /* __alpha__ */ --#include - #include - #include - #include -diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c ---- fglrx-install-old/common/lib/modules/fglrx/build_mod/firegl_public.c 2006-09-19 19:30:42.000000000 -0500 -+++ fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c 2006-10-27 09:45:47.463046368 -0500 -@@ -67,9 +67,6 @@ - * for example for CPU hot-plugging. I wonder why a desktop - * distribution would even include such a kernel patch. */ - #ifdef CONFIG_MEM_MIRROR --/* Prevent linux/config.h from being included again in subsequent -- * kernel headers as that would redefine CONFIG_MEM_MIRROR. */ --#include - #warning "Disabling CONFIG_MEM_MIRROR because it does not work with non-GPL modules." - #warning "This will break page tracking when the fglrx kernel module is used." - #undef CONFIG_MEM_MIRROR -@@ -86,7 +83,6 @@ - #include /* for installing the patch wrapper */ - #include - --#include - #include - #include - #include diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch deleted file mode 100644 index aeaba71..0000000 --- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.c 2006-12-18 10:58:15.000000000 -0500 -+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2006-12-18 11:14:04.000000000 -0500 -@@ -181,6 +181,70 @@ - int errno; - #endif // __ia64__ - -+#if defined(__i386__) -+#define __syscall_return(type, res) \ -+do { \ -+ if ((unsigned long)(res) >= (unsigned long)(-(128 + 1))) { \ -+ errno = -(res); \ -+ res = -1; \ -+ } \ -+ return (type) (res); \ -+} while (0) -+#define _syscall2(type,name,type1,arg1,type2,arg2) \ -+type name(type1 arg1,type2 arg2) \ -+{ \ -+long __res; \ -+__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \ -+ : "=a" (__res) \ -+ : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)) \ -+ : "memory"); \ -+__syscall_return(type,__res); \ -+} -+ -+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \ -+type name(type1 arg1,type2 arg2,type3 arg3) \ -+{ \ -+long __res; \ -+__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \ -+ : "=a" (__res) \ -+ : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)), \ -+ "d" ((long)(arg3)) : "memory"); \ -+__syscall_return(type,__res); \ -+} -+#elif defined(__x86_64__) -+#define __syscall_clobber "r11","rcx","memory" -+#define __syscall "syscall" -+ -+#define __syscall_return(type, res) \ -+do { \ -+ if ((unsigned long)(res) >= (unsigned long)(-127)) { \ -+ errno = -(res); \ -+ res = -1; \ -+ } \ -+ return (type) (res); \ -+} while (0) -+#define _syscall2(type,name,type1,arg1,type2,arg2) \ -+type name(type1 arg1,type2 arg2) \ -+{ \ -+long __res; \ -+__asm__ volatile (__syscall \ -+ : "=a" (__res) \ -+ : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)) : __syscall_clobber ); \ -+__syscall_return(type,__res); \ -+} -+ -+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \ -+type name(type1 arg1,type2 arg2,type3 arg3) \ -+{ \ -+long __res; \ -+__asm__ volatile (__syscall \ -+ : "=a" (__res) \ -+ : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)), \ -+ "d" ((long)(arg3)) : __syscall_clobber); \ -+__syscall_return(type,__res); \ -+} -+#endif -+ - // int mlock(const void *addr, size_t len); - _syscall2(int, mlock, const void *, addr, size_t, len ) - // int munlock(const void *addr, size_t len); diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch deleted file mode 100644 index 665d8d6..0000000 --- a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-29 23:48:46.000000000 +0200 -+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-30 00:15:21.000000000 +0200 -@@ -5055,7 +5057,6 @@ - */ - unsigned int ATI_API_CALL KAS_SlabCache_Destroy(void* hSlabCache) - { -- unsigned int ret = 0; - kasSlabCache_t* slabcache_obj = (kasSlabCache_t*)hSlabCache; - - DBG_ENTER("0x%08X", hSlabCache); -@@ -5069,18 +5070,11 @@ - - DBG_TRACE("destroying slab object '%s'", slabcache_obj->name); - -- if (kmem_cache_destroy(slabcache_obj->cache) == 0) -- { -- ret = 1; -- slabcache_obj->cache = NULL; -- } -- else -- { -- DBG_ERROR("destroying failed"); -- } -+ kmem_cache_destroy(slabcache_obj->cache); -+ slabcache_obj->cache = NULL; - -- DBG_LEAVE("%d", ret); -- return ret; -+ DBG_LEAVE("1"); -+ return 1; - } - - /** \brief Allocate an entry in a Slab Cache diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch deleted file mode 100644 index c830d38..0000000 --- a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-29 23:48:46.000000000 +0200 -+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-30 00:15:21.000000000 +0200 -@@ -171,6 +171,8 @@ - #endif - #endif - -+#include -+ - #include - - // To enable DBG_* macros set this variable to nonzero diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch deleted file mode 100644 index fb6119e..0000000 --- a/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch +++ /dev/null @@ -1,22 +0,0 @@ -=== modified file 'common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh' ---- common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2007-02-09 12:25:40 +0000 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2007-02-09 12:28:54 +0000 -@@ -46,7 +46,7 @@ - getXuser; - if [ x"$XAUTHORITY" != x"" ]; then - export DISPLAY=":$displaynum" -- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "/opt/bin/aticonfig --set-powerstate=1 --effective=now" - fi - done - else -@@ -56,7 +56,7 @@ - getXuser; - if [ x"$XAUTHORITY" != x"" ]; then - export DISPLAY=":$displaynum" -- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "/opt/bin/aticonfig --set-powerstate=3 --effective=now" - fi - done - fi - diff --git a/x11-drivers/ati-drivers/files/ati-powermode.sh.patch b/x11-drivers/ati-drivers/files/ati-powermode.sh.patch deleted file mode 100644 index cd776e0..0000000 --- a/x11-drivers/ati-drivers/files/ati-powermode.sh.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh ---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 -@@ -17,6 +17,10 @@ - fi - } - -+aticonfig='/opt/ati/bin/aticonfig' -+ -+# default high power state -+default_state=`$aticonfig --lsp | grep 'default state' | cut -c 3` - - grep -q closed /proc/acpi/button/lid/*/state - if [ $? = 0 ]; then -@@ -46,7 +50,7 @@ - getXuser; - if [ x"$XAUTHORITY" != x"" ]; then - export DISPLAY=":$displaynum" -- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=1 --effective=now" - fi - done - else -@@ -56,7 +60,7 @@ - getXuser; - if [ x"$XAUTHORITY" != x"" ]; then - export DISPLAY=":$displaynum" -- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=$default_state --effective=now" - fi - done - fi diff --git a/x11-drivers/ati-drivers/files/atieventsd.init b/x11-drivers/ati-drivers/files/atieventsd.init deleted file mode 100644 index 73139ce..0000000 --- a/x11-drivers/ati-drivers/files/atieventsd.init +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.init,v 1.3 2007/05/18 23:58:01 marienz Exp $ - -depend() { - need acpid -} - -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec /opt/sbin/atieventsd -- ${ATIEVENTSDOPTS} - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --exec /opt/sbin/atieventsd - eend $? -} \ No newline at end of file diff --git a/x11-drivers/ati-drivers/files/atieventsd.rc6 b/x11-drivers/ati-drivers/files/atieventsd.rc6 deleted file mode 100644 index 2180e0e..0000000 --- a/x11-drivers/ati-drivers/files/atieventsd.rc6 +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.rc6,v 1.2 2006/08/04 12:20:19 chrb Exp $ - -depend() { - need acpid -} - -start() { - start-stop-daemon --start --pidfile /var/run/atieventsd.pid \ - --exec /opt/ati/sbin/atieventsd -- ${ATIEVENTSDOPTS} - local pid=`pidof atieventsd` - echo $pid > /var/run/atieventsd.pid - eend $? -} - -stop() { - start-stop-daemon --stop --quiet --pidfile /var/run/atieventsd.pid - eend $? -} - diff --git a/x11-drivers/ati-drivers/files/libGL.la.in b/x11-drivers/ati-drivers/files/libGL.la.in deleted file mode 100644 index 7fdc409..0000000 --- a/x11-drivers/ati-drivers/files/libGL.la.in +++ /dev/null @@ -1,32 +0,0 @@ -# libGL.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGL.so.1' - -# Names of this library. -library_names='libGL.so.${libmajor}.${libminor} libGL.so.${libmajor} libGL.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs='-L/usr/${libdir} -lX11 -lXext -ldl' - -# Version information for libGL. -current=1 -age=0 -revision=${revision} - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/${libdir}' diff --git a/x11-misc/bubblemon/Manifest b/x11-misc/bubblemon/Manifest deleted file mode 100644 index 75ee44a..0000000 --- a/x11-misc/bubblemon/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX bubblemon-1.46-gtk.patch 3435 SHA256 6e02353acaebba6d0b0d2fc51ad200e5d499523e933586c41770bf4b652208b1 SHA512 c4e53b52db0aa2b62f9f52dbc7fc2943e31401cc6d7431033373f3083953626c724eb3be4f205e76a5546644c2fd6a68b2fa04ce314ede96cb5028e5fca91b9c WHIRLPOOL 8dd3e11ffd418e8b1a0bc4e371ab7cd2c97682816302d54c536fb5b7a8f0b89c2d6571dbd664b3910af7096f80baf9cd765519b89e58c99b25c57784f0fad974 -AUX bubblemon-1.46-no_display.patch 814 SHA256 b848d4c7f9c57408e688b8968efe6bddafc172a50b11bc5283405770096489e2 SHA512 5b1d9e952ec64f1195c50dab2e498df166d1e0d7bd2a0dbca05a375178e5ffebbcdba36847f607a1ca132d36283291f468b0d4d84c77e6e7570a6b1af963570b WHIRLPOOL dc4ec354f12364f143e8859ee525c493c0b3bcc35e71774bd9d5f5ec7e4bfbf188d562f57f63459d052cc9a70a6e13c6cc0666569ce105398cdc5feaae3da3e3 -DIST bubblemon-dockapp-1.46.tar.gz 40001 SHA256 f928073d3c69b2668e89b93cdcca5f390437831aab3eac3aa2129f8713e79dbf SHA512 c3d42f82ea7fb837839787a184a6198d7b092451e629562c90735a22166e75f55e8e1af1026e0314a4f06ff68bc48a22157e62bd19e54a4e38b4c12228396fa3 WHIRLPOOL 5f734e98d91f8921034bd0eefc06e7c9bf1ea997c40b907a8f6bec5a7e9ab5c74218195dd7cfbe93d6613e6523ee5d89f62e1e476727f8dea0fe02754b0945bc -EBUILD bubblemon-1.46-r10.ebuild 1058 SHA256 5a95b273ee52e31574f3219d00bf7f1c6385c023a9d63b5464ceb7916fa159c1 SHA512 49d71b70b1215944739a50d0371391df778dcfcd57d953dda57d2218b04762d8db442ea259f2d24ce1bad196339bba268c5a8dac400f5548bf67957008739c31 WHIRLPOOL b13bd2f1883f21ff522755f7f86b918426e1412137a87c9e56c8bcc2607a5eb620139ea8183c2d49e1037a4abd4098c240c1fb42827be5729647ce18fcf2d68c diff --git a/x11-misc/bubblemon/bubblemon-1.46-r10.ebuild b/x11-misc/bubblemon/bubblemon-1.46-r10.ebuild deleted file mode 100644 index 5a05d40..0000000 --- a/x11-misc/bubblemon/bubblemon-1.46-r10.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/bubblemon-1.46-r1.ebuild,v 1.8 2010/01/10 18:39:54 fauli Exp $ - -inherit eutils - -DESCRIPTION="A fun monitoring applet for your desktop, complete with swimming duck" -HOMEPAGE="http://www.ne.jp/asahi/linux/timecop" -SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${PN}-dockapp-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" -IUSE="" - -RDEPEND=">=x11-libs/gtk+-2" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S=${WORKDIR}/${PN}-dockapp-${PV} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-gtk.patch - epatch "${FILESDIR}"/${P}-no_display.patch -} - -src_compile() { - emake GENTOO_CFLAGS="${CFLAGS} -lX11" || die "emake failed." -} - -src_install () { - dobin bubblemon - - dodoc ChangeLog README doc/Xdefaults.sample - - insinto /usr/share/${PN} - doins misc/{*.xcf,*.wav} - - exeinto /usr/share/${PN} - doexe misc/wakwak.sh -} diff --git a/x11-misc/bubblemon/files/bubblemon-1.46-gtk.patch b/x11-misc/bubblemon/files/bubblemon-1.46-gtk.patch deleted file mode 100644 index fb7aa59..0000000 --- a/x11-misc/bubblemon/files/bubblemon-1.46-gtk.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff -ur bubblemon-dockapp-1.46.orig/bubblemon.c bubblemon-dockapp-1.46/bubblemon.c ---- bubblemon-dockapp-1.46.orig/bubblemon.c 2003-10-01 03:37:32.000000000 +0300 -+++ bubblemon-dockapp-1.46/bubblemon.c 2007-05-28 18:10:43.000000000 +0300 -@@ -58,6 +58,7 @@ - #include - #include - #include -+#include - - #include "include/master.xpm" - #include "include/bubblemon.h" -@@ -575,7 +576,7 @@ - attri.colormap = gdk_colormap_get_system(); - attri.wmclass_name = "bubblemon"; - attri.wmclass_class = "bubblemon"; -- attri.window_type = GDK_WINDOW_TOPLEVEL; -+ attri.window_type = GDK_WINDOW_CHILD; - - bm.iconwin = gdk_window_new(bm.win, &attri, - GDK_WA_TITLE | GDK_WA_WMCLASS); -@@ -593,7 +594,6 @@ - wmhints.window_group = win; - wmhints.flags = - StateHint | IconWindowHint | IconPositionHint | WindowGroupHint; -- XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints); - - bm.gc = gdk_gc_new(bm.win); - -@@ -606,6 +606,7 @@ - gdk_window_set_back_pixmap(bm.iconwin, bm.pixmap, False); - - gdk_window_show(bm.win); -+ XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints); - #ifdef KDE_DOCKAPP - /* makes the dockapp visible inside KDE wm */ - gdk_window_show(bm.iconwin); -diff -ur bubblemon-dockapp-1.46.orig/Makefile bubblemon-dockapp-1.46/Makefile ---- bubblemon-dockapp-1.46.orig/Makefile 2003-10-04 03:22:07.000000000 +0300 -+++ bubblemon-dockapp-1.46/Makefile 2007-05-28 18:11:20.000000000 +0300 -@@ -11,30 +11,49 @@ - - # no user serviceable parts below - EXTRA += $(WMAN) -+# gtk cflags and gtk lib flags -+GTK2_CFLAGS = $(shell pkg-config gtk+-2.0 --cflags) -+GTK2_LIBS = $(shell pkg-config gtk+-2.0 --libs) -+ -+ - # optimization cflags --CFLAGS = -O3 -ansi -Wall `gtk-config --cflags` ${EXTRA} -+#CFLAGS = -O3 -Wall ${EXTRA} -+CFLAGS = ${GENTOO_CFLAGS} ${EXTRA} -+ - # profiling cflags --# CFLAGS = -ansi -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO -+# CFLAGS = -ansi -Wall -pg -O3 ${EXTRA} -DPRO - # test coverage cflags --# CFLAGS = -fprofile-arcs -ftest-coverage -Wall -ansi -g `gtk-config --cflags` ${EXTRA} -DPRO -+# CFLAGS = -fprofile-arcs -ftest-coverage -Wall -ansi -g ${EXTRA} -DPRO - - --SHELL=sh -+SHELL = sh - OS = $(shell uname -s) -+SRCS = bubblemon.c - OBJS = bubblemon.o -+BUBBLEMON = bubblemon -+ -+LDFLAGS = -shared -Wl -+ -+STRIP = strip -+ - CC = gcc -+INSTALLMAN = -m 644 -+ -+ - - # special things for Linux - ifeq ($(OS), Linux) -- OBJS += sys_linux.o -- LIBS = `gtk-config --libs | sed "s/-lgtk//g"` -- INSTALL = -m 755 -+ SRCS += sys_linux.c -+ OBJS += sys_linux.o -+ INSTALL = -m 755 -+ INSTALLMAN = -m 644 - endif - - # special things for FreeBSD - ifeq ($(OS), FreeBSD) -+ SRCS += sys_freebsd.c - OBJS += sys_freebsd.o -- LIBS = `gtk-config --libs | sed "s/-lgtk//g"` -lkvm -+ LIBS = -lkvm - INSTALL = -c -g kmem -m 2755 -o root - endif - -@@ -62,17 +81,21 @@ - ifeq ($(COMPILER), gcc) - CFLAGS=-O3 -Wall - endif -- CFLAGS +=`gtk-config --cflags` ${EXTRA} -+ CFLAGS += ${EXTRA} -+ SRCS += sys_sunos.c - OBJS += sys_sunos.o -- LIBS = `gtk-config --libs` -lkstat -lm -+ LIBS = -lkstat -lm - INSTALL = -m 755 - endif - -+all: $(BUBBLEMON) - --all: bubblemon -+bubblemon: clean_obj -+ $(CC) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEMON) \ -+ $(LIBS) $(GTK2_LIBS) $(SRCS) - --bubblemon: $(OBJS) -- $(CC) $(CFLAGS) -o bubblemon $(OBJS) $(LIBS) -+clean_obj: -+ rm -rf *.o - - clean: - rm -f bubblemon *.o *.bb* *.gcov gmon.* *.da *~ diff --git a/x11-misc/bubblemon/files/bubblemon-1.46-no_display.patch b/x11-misc/bubblemon/files/bubblemon-1.46-no_display.patch deleted file mode 100644 index 2e7e0af..0000000 --- a/x11-misc/bubblemon/files/bubblemon-1.46-no_display.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- bubblemon-dockapp-1.46_gentoo/bubblemon.c 2010-03-25 22:27:19.000000000 +0100 -+++ bubblemon-dockapp-1.46/bubblemon.c 2010-03-25 22:30:04.000000000 +0100 -@@ -44,7 +44,7 @@ - */ - #define _GNU_SOURCE - --#define VERSION "1.41" -+#define VERSION "1.46" - - /* general includes */ - #include -@@ -276,6 +276,8 @@ - - int main(int argc, char **argv) - { -+ /* This is needed to proper dockapp work on >=GTK+-2.18 */ -+ setenv("GDK_NATIVE_WINDOWS", "1", 0); - char execute[256]; - int proximity = 0; - int ch; -@@ -607,10 +609,7 @@ - - gdk_window_show(bm.win); - XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints); --#ifdef KDE_DOCKAPP -- /* makes the dockapp visible inside KDE wm */ - gdk_window_show(bm.iconwin); --#endif - - /* We begin with zero bubbles */ - bm.n_bubbles = 0;