rpmfusion-commits
October 2008
rpmfusion-commits@lists.rpmfusion.org
- 18 participants
- 749 discussions
rpms/fglrx-kmod/F-8 fglrx-kmod.spec,1.1,1.2 sources,1.2,1.3
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31753/F-8
Modified Files:
fglrx-kmod.spec sources
Log Message:
Update to Catalyst 8.10 for F-8, 8.11beta for devel and F-9
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-8/fglrx-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fglrx-kmod.spec 5 Oct 2008 12:36:10 -0000 1.1
+++ fglrx-kmod.spec 16 Oct 2008 18:32:09 -0000 1.2
@@ -5,7 +5,7 @@
# a new akmod package will only get build when a new one is actually needed
#define buildforkernels newest
-%define ativersion 8.09
+%define ativersion 8.10
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -14,8 +14,8 @@
%endif
Name: fglrx-kmod
-Version: 8.532
-Release: 3.%{ativersion}%{?dist}.1
+Version: 8.542
+Release: 1.%{ativersion}%{?dist}.1
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -108,6 +108,9 @@
%changelog
+* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-1.8.10.1
+- Update to 8.10
+
* Sun Oct 05 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 8.532-3.8.09.1
- rebuild for rpm fusion
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 5 Oct 2008 12:36:10 -0000 1.2
+++ sources 16 Oct 2008 18:32:09 -0000 1.3
@@ -1 +1 @@
-3bab5b593e55f7e5a135bc4149ff3ec3 fglrx-kmod-data-8.532.tar.bz2
+5093c58b1d9d14e4e4ca3117a7fec810 fglrx-kmod-data-8.542.tar.bz2
16 years
- 1
- 0
rpms/fglrx-kmod/devel fglrx-kmod.spec, NONE, 1.1 fglrx-kmodtool-excludekernel-filterfile, NONE, 1.1 fglrx-makefile.diff, NONE, 1.1 fglrx-makesh.diff, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31753/devel
Modified Files:
.cvsignore sources
Added Files:
fglrx-kmod.spec fglrx-kmodtool-excludekernel-filterfile
fglrx-makefile.diff fglrx-makesh.diff
Log Message:
Update to Catalyst 8.10 for F-8, 8.11beta for devel and F-9
--- NEW FILE fglrx-kmod.spec ---
# buildforkernels macro hint: when you build a new version or a new release
# that contains bugfixes or other improvements then you must disable the
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
#define buildforkernels newest
%define ativersion 8.11beta
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
%define __debug_install_post %{_builddir}/%{?buildsubdir}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
%{nil}
%endif
Name: fglrx-kmod
Version: 8.543
Release: 0.1.%{ativersion}%{?dist}.1
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://ati.amd.com/support/drivers/linux/linux-radeon.html
Source0: http://www.diffingo.com/downloads/livna/kmod-data/fglrx-kmod-data-%{versi...
Source11: fglrx-kmodtool-excludekernel-filterfile
# These control kernel version detection
Patch1: fglrx-makefile.diff
Patch2: fglrx-makesh.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i586 i686 x86_64
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
%description
The fglrx %{version} display driver kernel module.
%prep
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c -T -a 0
# Tweak to have debuginfo - part 2/2
%if 0%{?fedora} > 7
cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
%endif
mkdir fglrxpkg
%ifarch %{ix86}
cp -r fglrx/common/* fglrx/arch/x86/* fglrxpkg/
%endif
%ifarch x86_64
cp -r fglrx/common/* fglrx/arch/x86_64/* fglrxpkg/
%endif
# proper permissions
find fglrxpkg/lib/modules/fglrx/build_mod/ usr/share/doc -type d -print0 | xargs -0 chmod 0755
find fglrxpkg/lib/modules/fglrx/build_mod/ -type f -print0 | xargs -0 chmod 0644
# debuginfo fix
#sed -i -e 's|strip -g|/bin/true|' fglrxpkg/lib/modules/fglrx/build_mod/make.sh
# These control kernel version detection
pushd fglrxpkg/lib/modules/fglrx/build_mod/
%patch1 -b .patch1
%patch2 -b .patch2
popd
for kernel_version in %{?kernel_versions} ; do
cp -a fglrxpkg/ _kmod_build_${kernel_version%%___*}
done
%build
for kernel_version in %{?kernel_versions}; do
pushd _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/
export AS_USER=y
export KERNEL_PATH="${kernel_version##*___}"
export FEDORA_UNAME_R="${kernel_version%%___*}"
export FEDORA_UNAME_M="%{_target_cpu}"
export CC="gcc"
bash make.sh verbose
popd
done
%install
rm -rf $RPM_BUILD_ROOT
for kernel_version in %{?kernel_versions}; do
install -D -m 0755 _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $RPM_BUILD_ROOT%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/fglrx.ko
done
%{?akmod_install}
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-0.1.8.11beta.1
- Update to 8.53.4 (Catalyst 8.11beta)
* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-1.8.10.1
- Update to 8.10
* Sat Sep 21 2008 Stewart Adam <s.adam at diffingo.com> - 8.532-1.8.09
- Update to 8.09
* Thu Aug 21 2008 Stewart Adam <s.adam at diffingo.com> - 8.522-1.8.08
- Update to 8.08
* Thu Jul 24 2008 Stewart Adam <s.adam at diffingo.com> - 8.512-1.8.07
- Update to 8.07
* Wed Jun 18 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.501-1.8.06
- Update to 8.06
* Thu May 22 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.493-1.8.05
- Update to 8.05
- Remove obsolete 2.6.25 capt patch
- Update debuginfo fix
* Fri Apr 18 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.476-1.8.04
- Update to 8.04
- Add capt patch to fix compiling against 2.6.25 kernels
- Fix license tag
* Wed Mar 5 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.471-1.8.03
- Update to 8.03
* Wed Feb 13 2008 Stewart Adam <s.adam AT diffingo DOT com> - 8.455.2-1.8.02
- Update to 8.02
* Sat Jan 26 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.452.1-3.8.01
- rebuild for new kmodtools, akmod adjustments
* Sun Jan 20 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.452.1-2.8.01
- build akmods package
* Sat Jan 19 2008 Stewart Adam <s.adam[AT]diffingo[DOT]com> - 8.452.1-1.8.01
- Update to Catalyst 8.01
- Fix License tag according to rpmlint
* Sat Dec 22 2007 Stewart Adam <s.adam[AT]diffingo[DOT]com> - 8.443.1-1.7.12
- Update to Catalyst 7.12
- Drop obsolete suspend patch
* Sat Dec 8 2007 Stewart Adam <s.adam[AT]diffingo[DOT]com> - 8.43-3.7.11
- Rebuild for latest kernels
* Wed Nov 21 2007 Stewart Adam <s.adam[AT]diffingo[DOT]com> - 8.43-2.7.11
- Fix stupid mistake in patch version
* Wed Nov 21 2007 Stewart Adam <s.adam[AT]diffingo[DOT]com> - 8.43-1.7.11
- Update to Catalyst 7.11
* Sat Nov 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.42.3-8
- rebuilt for 2.6.23.1-49.fc8
* Mon Nov 05 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.42.3-7
- rebuilt for F8 kernels
* Wed Oct 31 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.42.3-6
- rebuilt for latest kernels
* Tue Oct 30 2007 Stewart Adam <s.adam[AT]diffingo[DOT]com> - 8.42.3-5
- Add suspend patch (fixes bz#1691)
* Tue Oct 30 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.42.3-4
- rebuilt for latest kernels
* Sat Oct 27 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.42.3-3
- rebuilt for latest kernels
- adjust to rpmfusion and new kmodtool
* Sat Oct 27 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.42.3-2
- rebuilt for latest kernels
* Tue Oct 23 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.42.3-1
- Update to 8.42.3
- Update 2.6.23 patch
* Tue Oct 23 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.40.4-13
- rebuilt for latest kernels
* Mon Oct 22 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.40.4-12
- rebuilt for latest kernels
* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.40.4-11
- rebuilt for latest kernels
* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.40.4-10
- rebuilt for latest kernels
* Fri Oct 12 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.40.4-9
- rebuilt for latest kernels
* Thu Oct 11 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.40.4-8
- rebuilt for latest kernels
* Wed Oct 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 8.40.4-7
- rebuilt for latest kernels
* Tue Oct 09 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 8.40.4-6
- rebuilt for latest kernels
* Sun Oct 7 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.40.4-5
- update for new kmod-helper stuff
- build for newest kernels
* Sun Oct 7 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.40.4-4
- 2.6.23 patch
* Sun Sep 09 2007 Thorsten Leemhuis < fedora AT leemhuis DOT info > - 8.40.4-3
- Convert to new kmods stuff from livna
- Rebuild for F8T2 and rawhide
* Sun Aug 19 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.40.4-2
- Don't use testing kernel
* Thu Aug 16 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.40.4-1
- Update to 8.40.4
* Sun Jul 23 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.39.4-2
- Update ATI's fixed 8.39.4
* Thu Jul 19 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.39.4-1
- Update to 8.39.4
* Sun Jul 1 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.38.7-2
- Bump
* Sat Jun 30 2007 Niko Mirthes <nmirthes AT gmail DOT com> - 8.38.7-1
- Update to 8.38.7
* Tue Jun 26 2007 Niko Mirthes <nmirthes AT gmail DOT com> - 8.38.6-1
- corrected version update in changelog
- removed sed edit for past releases on 2.6.2x.x kernel
* Mon Jun 25 2007 Niko Mirthes <nmirthes AT gmail DOT com> - 8.38.6-1
- Update to 8.38.6
- removed agpgart patch. agpgart_be.c no longer exists
* Sun Jun 03 2007 Niko Mirthes <nmirthes AT gmail DOT com> - 8.37.6-2
- Updated URL field to current address.
* Thu May 31 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.37.6-1
- Update to 8.37.6
* Fri Apr 27 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.36.5-3
- Rebuild for F7T4
* Wed Apr 19 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.36.5-2
- Just because it builds without the patches doesn't mean the patches are useless...
* Wed Apr 18 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.36.5-1
- Update to new 8.36.5 release
- Remove old patches
* Tue Apr 17 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.35.5-2
- Testing deemed this safe and working, so bump for official build
- Do a little spec cleanup
* Fri Mar 30 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.35.5-1
- Update to 8.35.5
- Copy 'official' 2.6.20 patch from fglrxpkg
- Remove old patches
* Mon Mar 26 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.34.8-6
- Ville Skyttä's patch for debuginfo packages (#1459)
* Sun Mar 4 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.34.8-5
- kdump for non-i686...
- Fix changelog date
* Sat Mar 3 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.34.8-4
- No kdump
- New kernel
* Fri Mar 2 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.34.8-3
- New kernel
- Make Source0 a URL
* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com> - 8.34.8-2
- Standardize all summaries and descriptions with other nvidia and fglrx
packages
- Kernel bump
* Sun Feb 21 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.34.8-1
- Update to 8.34.8
- Move paths and names to plain fglrx, not ati-fglrx, the driver's name's
long changed!
- Product support in %%description...
- Conditional patch for 2.6.20
* Sat Feb 17 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.33.6-2
- Change descriptions to more informative, easy-to-understand ones
* Fri Jan 12 2007 Stewart Adam <s.adam AT diffingo DOT com> - 8.33.6-1
- Update to 8.33.6
* Fri Nov 17 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.31.5-1
- Update to 8.31.5, patch from Edgan in #livna
* Sat Oct 14 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.29.6-1
- Update to 8.29.6 (needed for 2.6.18 suppport/FC6)
* Fri Aug 18 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 8.28.8-1
- Update to 8.28.8
- refactored %%prep now that ATi's installer has merged arches
* Thu Aug 10 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 8.27.10-3
- update for kernel 2.6.17-1.2174_FC5
* Sat Aug 05 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 8.27.10-2
- no i586 on fc5
* Sun Jul 30 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 8.27.10-1
- Update to 8.27.10
- removal of random tabs
* Tue Jun 27 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.26.18-1
- Update to 8.26.18
* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 8.25.18-2
- Invoke kmodtool with bash instead of sh.
* Wed May 24 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.25.18-1
- Update to 8.25.18
- drop patch25
* Thu May 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 8.24.8-3
- Require version >= of fglrx-kmod-common.
- Provide fglrx-kmod instead of kmod-fglrx to fix upgrade woes (#970).
* Thu Apr 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 8.24.8-2
- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
* Sat Apr 15 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 8.24.8-1
- Update to 8.24.8
- Remove old patches, x86_64 patch still needed
* Thu Mar 23 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 8.23.7.1-4
- apply patches that might fix x86_64 at least for some people
* Thu Mar 23 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 8.23.7.1-3
- disable xen0, too
* Wed Mar 22 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 8.23.7.1-2
- allow to pass kversion and kvariants via command line
- disable x86_64 (build problem)
* Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.23.7.1-1
- drop 0.lvn
- drop ati-fglrx-get_page.patch patch
- update to 8.23.7
- hardcode kversion and kvariants
* Wed Feb 08 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.20.8.1-0.lvn.2
- add ati-fglrx-accessok.patch
* Mon Jan 30 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.20.8.1-0.lvn.1
- split into packages for userland and kmod
- rename to fglrx-kmod
* Mon Dec 19 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.20.8.1-0.lvn.3
- Add patch for kernel 2.6.15
* Tue Dec 13 2005 Dams <anvil[AT]livna.org> - 8.20.8.1-0.lvn.2
- Really dropped Epoch
* Sat Dec 10 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.20.8.1-0.lvn.1
- Update to 8.20.8-1
- Drop Epoch
* Sun Nov 13 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 8.19.10.1-0.lvn.2
- Patch for 2.6.14 still needed on x86_64 (thx Ryo Dairiki for noticing)
* Sat Nov 12 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.19.10.1-0.lvn.1
- Update to 8.19.10-1
- Remove patches for 2.6.14
- Add fresh translation to desktop-file
* Wed Nov 09 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.18.6.1-0.lvn.2
- Patch kernel-module source to compile with 2.6.14
* Thu Oct 13 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.18.6.1-0.lvn.1
- Update to 8.18.6-1
- Conflict with nvidia-glx{,-legacy) (#627)
- Fix moduleline.split in ati-fglrx-config-display (#582)
- Unload drm in ati-fglrx-config-display, too
- Only ship self compiled fireglcontrolpanel
* Fri Aug 19 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.16.20.1-0.lvn.1
- Update to 8.16.20-1
- Update patch1, fireglcontrol.desktop
- Don't strip kernel-module for now
* Tue Jun 07 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.14.13.1-0.lvn.5
- Update fglrx-2.6.12-inter_module_get.patch (thx to Mike Duigou)
* Tue Jun 07 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.14.13.1-0.lvn.4
- Add patches from http://ati.cchtml.com/show_bug.cgi?id=136 and some tricks
to built with 2.6.12 -- fixes building for FC4
* Tue Jun 07 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.14.13.1-0.lvn.3
- Missed one thing during reword of kernel-module-build-stuff
- Both x86_64 and x86 in the same package now
* Sun Jun 05 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.14.13.1-0.lvn.2
- Fix thinko
* Sun Jun 05 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.14.13.1-0.lvn.1
- Rework kernel-module-build-stuff for FC3 kmd and FC4 and new livna scheme
- Simplify the install; Lowers risk to miss files and is easier to maintain
- Remove dep on fedora-rpmdevtools
- Use modules and userland rpmbuild parameter to not build kernel- or driver-package
* Wed May 04 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.12.10.1-0.lvn.2
- Add fix for kernel 2.6.11
* Fri Apr 08 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.12.10.1-0.lvn.1
- Update to 8.12.10-1
- mod 0755 dri.so to let rpm detect require libstdc++.so.5
* Thu Mar 06 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.10.19.1-0.lvn.2
- Add patch for via agpgart (#355)
* Thu Feb 17 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.10.19.1-0.lvn.1
- Update to 8.10.19-1
- Remove patch for 2.6.10 kernel
- require libstdc++.so.5
* Wed Jan 19 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.8.25.1-0.lvn.4
- fix x86-64 in spec-file and in ati-fglrx-config-display
- Fix by Ville Skyttä: ldconfig on upgrades
* Wed Jan 19 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.8.25.1-0.lvn.3
- Package library links
* Wed Jan 19 2005 Dams <anvil[AT]livna.org> - 0:8.8.25.1-0.lvn.2
- Urlized ati rpm source
* Sat Jan 15 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:8.8.25.1-0.lvn.1
- Update to 8.8.25
- Remove workaround from last version
- Remove special drm includes
- Prepare package for 64-bit version; But untested ATM
- Update patches
* Tue Jan 11 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.6-0.lvn.3
- add patch10 -- allows building on 2.6.10; Found:
http://www.rage3d.com/board/showthread.php?t=33798874&highlight=2.6.10
- update drm-includes
- temporary for kernel-module: Requires: ati-fglrx >= %%{epoch}:%%{version}-0.lvn.2
so we don't have to rebuild the driver package
* Sun Nov 21 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.6-0.lvn.2
- Use kernelp and driverp rpmbuild parameter to not build kernel- or
driver-package
- Trim doc in header
* Fri Nov 04 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.6-0.lvn.1
- Update to 3.14.6
* Fri Nov 04 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.7
- Build per default without kmoddev
- Rename --without tools to --without dirverp
- Update dri-headers to 2.6.9 version
- update building documentation in header
* Fri Oct 22 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.6
- Some small cleanups to various parts of the package as suggested by Dams
* Fri Oct 22 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.5
- Enhance makefile patch so building with different uname should work correctly
- Build verbose
* Thu Oct 21 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.4
- Update fedora-unrpm usage to work with newer version
- Update one para in README and ati-fglrx-config-display output
* Fri Oct 15 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.3
- Change the enabling/disabling methode again -- driver is changed now
directly. DRI is enabled when fglrx is enabled, but try to unload/warn if
radeon kernel-module is loaded. DRI will be disabled and reenabled on the
when next restart when disableing fglrx driver.
- Update README.fglrx.Fedora
* Mon Oct 11 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.2
- Let new version of ati-flrx-config-display change default depth to 24
- Updated Spec-File bits: fedora-kmodhelper usage and building description
* Thu Sep 30 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.14.1-0.lvn.1
- Update to 3.14.1
- In expectation of missing kernel-sourcecode package in FC3 remove the BR
on it and include the neccessary header-files in the package. Will
integrate more packages if there are API changes. But for now I
think this is the easiest methode.
- Let ati-flrx-config-display handle /etc/ld.so.conf.d/ati-fglrx.conf
- Update ati-flrx-config-display; it adds a VideoOverlay Option now
so xv works out of the box
- Don't (de)activate driver if DRI-Kernel-Modules are loaded; Let the
init script to that during restart
- Update README.fglrx.Fedora
* Wed Sep 29 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:3.12.0-0.lvn.2
- Allow rpm to strip the kernel module.
- Fix shared library permissions.
- Split Requires(post,postun) to two to work around a bug in rpm.
- Fix -devel dependencies and kernel module package provisions.
- Improve summary and description, remove misleading comments.
* Sat Sep 11 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.12.0-0.lvn.1
- Update to 3.12.0
- Fix some fedora-kmodhelper/kernel-module related bits in spec
- Clean up install part a bit more
* Sun Sep 05 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.6
- Add stupid ati-fglrx.profile.d workaround for systems that had the
original fglrx drivers installed before
- Conflict with fglrx -- the package should be removed so it can clean up
the mess it did itself.
- Clean up desktop file
* Tue Aug 24 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.5
- Add ifdefs so building tools and kernel-module can be separated
- BuildRequire kernel-sourcecode kverrel, not kernel
* Wed Aug 17 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.4
- Fixed double release in Requires of devel-package
- Building against custom kernels now should work using rhkernel-macro
- Updated fedora-kmodhelper to 0.9.10
- Add 'include ld.so.conf.d/*.conf' before /usr/lib/X11 in /etc/ld.so.conf if
it does not exists
* Wed Aug 10 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.3
- small fixes for dump issues
* Thu Aug 09 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.2
- BuildRequire fedora-rpmdevtools
- Use KERNEL_PATH correctly, needs updated patch1
* Sat Aug 07 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.11.1-0.lvn.1
- Update to 3.11.1
- Minor fixes
* Fri Aug 6 2004 Dams <anvil[AT]livna.org> 0:3.9.0-0.lvn.4
- .a files are 0644 moded. tgz files too.
- Added missing BuildReq: desktop-file-utils, qt-devel, fedora-rpmdevtools
* Mon Jul 19 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.9.0-0.lvn.3
- Update Patches to a working solution
- Modify start-script-- fglrx can also work without kernel-module (no DRI then)
* Sun Jul 18 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.9.0-0.lvn.2
- intergrate Readme, init-script and ati-fglrx-config-display (stolen from
nvidia package)
* Sat Jul 17 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:3.9.0-0.lvn.1
- Initial RPM release.
--- NEW FILE fglrx-kmodtool-excludekernel-filterfile ---
xen$
fglrx-makefile.diff:
--- NEW FILE fglrx-makefile.diff ---
--- 2.6.x/Makefile.old 2005-01-13 19:43:14.938719720 +0100
+++ 2.6.x/Makefile 2005-01-13 19:40:13.825253152 +0100
@@ -27,11 +27,7 @@
KVER = $(shell uname -r)
# KVER = 2.6.0-0.test1.1.26custom
-ifeq (1,1)
-KDIR = /lib/modules/$(KVER)/build
-else
-KDIR = /usr/src/linux-$(KVER)
-endif
+KDIR = $(KERNEL_PATH)
PWD = $(shell pwd)
fglrx-cfiles = ${fglrx-c-objs:.o=.c}
fglrx-makesh.diff:
--- NEW FILE fglrx-makesh.diff ---
--- make.sh.old 2005-01-13 19:41:53.485102552 +0100
+++ make.sh 2005-01-13 19:40:01.866071224 +0100
@@ -75,10 +75,10 @@
# ==============================================================
# system/kernel identification
-uname_r=`uname -r`
-uname_v=`uname -v`
+uname_r="${FEDORA_UNAME_R}"
+uname_v="$(grep UTS_VERSION ${KERNEL_PATH}/include/linux/compile.h | cut -d'"' -f2)"
uname_s=`uname -s`
-uname_m=`uname -m`
+uname_m="${FEDORA_UNAME_M}"
uname_a=`uname -a`
# if you want to overload the current settings then please enter 1 below
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Oct 2008 12:02:14 -0000 1.1
+++ .cvsignore 16 Oct 2008 18:32:09 -0000 1.2
@@ -0,0 +1 @@
+fglrx-kmod-data-8.543.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Oct 2008 12:02:14 -0000 1.1
+++ sources 16 Oct 2008 18:32:09 -0000 1.2
@@ -0,0 +1 @@
+f3f08c9f33f45a0b5be7f55a81aee9dd fglrx-kmod-data-8.543.tar.bz2
16 years
- 1
- 0
rpms/xorg-x11-drv-fglrx/F-9 .cvsignore, 1.1, 1.2 sources, 1.2, 1.3 xorg-x11-drv-fglrx.spec, 1.1, 1.2
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30700/F-9
Modified Files:
.cvsignore sources xorg-x11-drv-fglrx.spec
Log Message:
Update to 8.543 beta (Catalyst 8.11 beta)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 16 Oct 2008 16:20:01 -0000 1.2
+++ sources 16 Oct 2008 18:14:58 -0000 1.3
@@ -1 +1 @@
-9d1870c13bc9d7e5dccfcc62376828ff28471f0a ati-driver-installer-8-10-x86.x86_64.run
+6abc8e86f1a00168ba8f43d58f71cb69 fglrx-installer_8.543.orig.tar.gz
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-fglrx.spec 16 Oct 2008 16:20:01 -0000 1.1
+++ xorg-x11-drv-fglrx.spec 16 Oct 2008 18:14:58 -0000 1.2
@@ -1,5 +1,5 @@
%define atilibdir %{_libdir}/fglrx
-%define ativersion 8.10
+%define ativersion 8.11beta
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -8,13 +8,14 @@
%endif
Name: xorg-x11-drv-fglrx
-Version: 8.542
-Release: 1.%{ativersion}%{?dist}
+Version: 8.543
+Release: 0.1.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: BSD/Commercial/GPL/QPL
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
+#Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
+Source0: http://archive.ubuntu.com/ubuntu/pool/multiverse/f/fglrx-installer/fglrx-...
Source1: fglrx-README.Fedora
Source3: fglrx-config-display
Source4: fglrx-init
@@ -98,7 +99,13 @@
%prep
%setup -q -c -T
-sh %{SOURCE0} --extract fglrx
+#sh %{SOURCE0} --extract fglrx
+mkdir -p fglrx/common
+pushd fglrx
+tar xfz %{SOURCE0}
+mv etc lib opt usr common
+cp common/usr/share/doc/fglrx/ATI_LICENSE.TXT .
+popd
tar -cjf fglrx-kmod-data-%{version}.tar.bz2 fglrx/ATI_LICENSE.TXT fglrx/common/*/modules/fglrx/ fglrx/arch/*/*/modules/fglrx/
@@ -110,11 +117,13 @@
mkdir fglrxpkg
%ifarch %{ix86}
-cp -r fglrx/common/* fglrx/x710/* fglrx/arch/x86/* fglrxpkg/
+#cp -r fglrx/common/* fglrx/x710/* fglrx/arch/x86/* fglrxpkg/
+cp -r fglrx/common/* fglrx/x740/* fglrx/arch/x86/* fglrxpkg/
%endif
%ifarch x86_64
-cp -r fglrx/common/* fglrx/x710_64a/* fglrx/arch/x86_64/* fglrxpkg/
+#cp -r fglrx/common/* fglrx/x710_64a/* fglrx/arch/x86_64/* fglrxpkg/
+cp -r fglrx/common/* fglrx/x740_64a/* fglrx/arch/x86_64/* fglrxpkg/
%endif
# fix doc perms
@@ -297,6 +306,9 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.1.8.11beta
+- Update to 8.11 beta (8.54.3)
+
* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-1.8.10
- Update to 8.10
16 years
- 1
- 0
rpms/xorg-x11-drv-fglrx/devel .cvsignore, 1.1, 1.2 sources, 1.2, 1.3 xorg-x11-drv-fglrx.spec, 1.1, 1.2
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30700/devel
Modified Files:
.cvsignore sources xorg-x11-drv-fglrx.spec
Log Message:
Update to 8.543 beta (Catalyst 8.11 beta)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Oct 2008 12:03:10 -0000 1.1
+++ .cvsignore 16 Oct 2008 18:14:58 -0000 1.2
@@ -0,0 +1 @@
+fglrx-installer_8.543.orig.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 16 Oct 2008 16:20:01 -0000 1.2
+++ sources 16 Oct 2008 18:14:58 -0000 1.3
@@ -1 +1 @@
-9d1870c13bc9d7e5dccfcc62376828ff28471f0a ati-driver-installer-8-10-x86.x86_64.run
+6abc8e86f1a00168ba8f43d58f71cb69 fglrx-installer_8.543.orig.tar.gz
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-fglrx.spec 16 Oct 2008 16:20:01 -0000 1.1
+++ xorg-x11-drv-fglrx.spec 16 Oct 2008 18:14:58 -0000 1.2
@@ -1,5 +1,5 @@
%define atilibdir %{_libdir}/fglrx
-%define ativersion 8.10
+%define ativersion 8.11beta
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -8,13 +8,14 @@
%endif
Name: xorg-x11-drv-fglrx
-Version: 8.542
-Release: 1.%{ativersion}%{?dist}
+Version: 8.543
+Release: 0.1.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: BSD/Commercial/GPL/QPL
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
+#Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
+Source0: http://archive.ubuntu.com/ubuntu/pool/multiverse/f/fglrx-installer/fglrx-...
Source1: fglrx-README.Fedora
Source3: fglrx-config-display
Source4: fglrx-init
@@ -98,7 +99,13 @@
%prep
%setup -q -c -T
-sh %{SOURCE0} --extract fglrx
+#sh %{SOURCE0} --extract fglrx
+mkdir -p fglrx/common
+pushd fglrx
+tar xfz %{SOURCE0}
+mv etc lib opt usr common
+cp common/usr/share/doc/fglrx/ATI_LICENSE.TXT .
+popd
tar -cjf fglrx-kmod-data-%{version}.tar.bz2 fglrx/ATI_LICENSE.TXT fglrx/common/*/modules/fglrx/ fglrx/arch/*/*/modules/fglrx/
@@ -110,11 +117,14 @@
mkdir fglrxpkg
%ifarch %{ix86}
-cp -r fglrx/common/* fglrx/x710/* fglrx/arch/x86/* fglrxpkg/
+#cp -r fglrx/common/* fglrx/x710/* fglrx/arch/x86/* fglrxpkg/
+cp -r fglrx/common/* fglrx/x740/* fglrx/arch/x86/* fglrxpkg/
%endif
%ifarch x86_64
-cp -r fglrx/common/* fglrx/x710_64a/* fglrx/arch/x86_64/* fglrxpkg/
+echo `pwd`
+#cp -r fglrx/common/* fglrx/x710_64a/* fglrx/arch/x86_64/* fglrxpkg/
+cp -r fglrx/common/* fglrx/x740_64a/* fglrx/arch/x86_64/* fglrxpkg/
%endif
# fix doc perms
@@ -297,6 +307,9 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.1.8.11beta
+- Update to 8.11 beta (8.54.3)
+
* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-1.8.10
- Update to 8.10
16 years
- 1
- 0
rpms/comical/F-8 comical.spec,1.1,1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/comical/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30578
Modified Files:
comical.spec
Log Message:
* Thu Oct 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-7
- rebuild
Index: comical.spec
===================================================================
RCS file: /cvs/nonfree/rpms/comical/F-8/comical.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comical.spec 27 Sep 2008 18:55:04 -0000 1.1
+++ comical.spec 16 Oct 2008 18:13:16 -0000 1.2
@@ -1,6 +1,6 @@
Name: comical
Version: 0.8
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: GUI comic book viewer
License: GPLv2
Group: Applications/Multimedia
@@ -51,6 +51,9 @@
%{_datadir}/pixmaps/%{name}.png
%changelog
+* Thu Oct 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-7
+- rebuild
+
* Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.8-6
- Fix building with latest wxWidgets
16 years
- 1
- 0
rpms/comical/F-9 comical.spec,1.1,1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/comical/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30199
Modified Files:
comical.spec
Log Message:
* Thu Oct 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-7
- rebuild
Index: comical.spec
===================================================================
RCS file: /cvs/nonfree/rpms/comical/F-9/comical.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comical.spec 27 Sep 2008 18:55:09 -0000 1.1
+++ comical.spec 16 Oct 2008 18:13:03 -0000 1.2
@@ -1,6 +1,6 @@
Name: comical
Version: 0.8
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: GUI comic book viewer
License: GPLv2
Group: Applications/Multimedia
@@ -51,6 +51,9 @@
%{_datadir}/pixmaps/%{name}.png
%changelog
+* Thu Oct 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-7
+- rebuild
+
* Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.8-6
- Fix building with latest wxWidgets
16 years
- 1
- 0
rpms/comical/devel comical.spec,1.2,1.3
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/comical/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30077
Modified Files:
comical.spec
Log Message:
* Thu Oct 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-7
- rebuild
Index: comical.spec
===================================================================
RCS file: /cvs/nonfree/rpms/comical/devel/comical.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- comical.spec 27 Sep 2008 18:53:15 -0000 1.2
+++ comical.spec 16 Oct 2008 18:12:48 -0000 1.3
@@ -1,6 +1,6 @@
Name: comical
Version: 0.8
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: GUI comic book viewer
License: GPLv2
Group: Applications/Multimedia
@@ -51,6 +51,9 @@
%{_datadir}/pixmaps/%{name}.png
%changelog
+* Thu Oct 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-7
+- rebuild
+
* Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.8-6
- Fix building with latest wxWidgets
16 years
- 1
- 0
rpms/e-uae/F-8 e-uae-0.8.29-execstack.patch, NONE, 1.1 e-uae-0.8.29-hardfilefixes.patch, NONE, 1.1 e-uae-0.8.29-irqfixes.patch, NONE, 1.1 e-uae.png, NONE, 1.1 e-uae.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/e-uae/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28199/F-8
Modified Files:
.cvsignore sources
Added Files:
e-uae-0.8.29-execstack.patch e-uae-0.8.29-hardfilefixes.patch
e-uae-0.8.29-irqfixes.patch e-uae.png e-uae.spec
Log Message:
First import
e-uae-0.8.29-execstack.patch:
--- NEW FILE e-uae-0.8.29-execstack.patch ---
Only in e-uae-0.8.29-WIP4: autom4te.cache
diff -dur e-uae-0.8.29-WIP4.orig/configure e-uae-0.8.29-WIP4/configure
--- e-uae-0.8.29-WIP4.orig/configure 2007-03-28 06:20:21.000000000 +0200
+++ e-uae-0.8.29-WIP4/configure 2008-08-15 10:27:51.000000000 +0200
@@ -18154,57 +18154,6 @@
fi
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
-
- { echo "$as_me:$LINENO: checking whether assembler supports --execstack option" >&5
-echo $ECHO_N "checking whether assembler supports --execstack option... $ECHO_C" >&6; }
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="-Wa,--execstack $CFLAGS"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-int main (void) {return 0;}
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- UAE_CFLAGS="-Wa,--execstack $UAE_CFLAGS"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$SAVE_CFLAGS"
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
diff -dur e-uae-0.8.29-WIP4.orig/configure.in e-uae-0.8.29-WIP4/configure.in
--- e-uae-0.8.29-WIP4.orig/configure.in 2007-03-28 03:41:28.000000000 +0200
+++ e-uae-0.8.29-WIP4/configure.in 2008-08-15 10:25:42.000000000 +0200
@@ -762,16 +762,6 @@
fi
fi
AC_MSG_RESULT(yes)
-
- AC_MSG_CHECKING([whether assembler supports --execstack option])
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="-Wa,--execstack $CFLAGS"
- AC_TRY_COMPILE(, int main (void) {return 0;},
- [AC_MSG_RESULT(yes)
- UAE_CFLAGS="-Wa,--execstack $UAE_CFLAGS"],
- AC_MSG_RESULT(no)
- )
- CFLAGS="$SAVE_CFLAGS"
else
AC_MSG_RESULT(no)
fi
e-uae-0.8.29-hardfilefixes.patch:
--- NEW FILE e-uae-0.8.29-hardfilefixes.patch ---
--- e-uae-0.8.29-WIP4/src/hardfile.c.orig 2007-03-12 20:21:13.000000000 +0000
+++ e-uae-0.8.29-WIP4/src/hardfile.c 2008-03-21 02:10:49.000000000 +0000
@@ -432,8 +432,12 @@
if (!hfpd->opencount)
return 0;
hfpd->opencount--;
- if (hfpd->opencount == 0)
+
+ if (hfpd->opencount == 0) {
write_comm_pipe_u32 (&hfpd->requests, 0, 1);
+ uae_sem_wait (&hfpd->sync_sem);
+ }
+
put_word (m68k_areg (&context->regs, 6) + 32, get_word (m68k_areg (&context->regs, 6) + 32) - 1);
return 0;
}
@@ -663,7 +667,7 @@
error = handle_scsi (request, hfd);
} else { /* we don't want users trashing their "partition" hardfiles with hdtoolbox */
error = -3; /* IOERR_NOCMD */
- write_log ("UAEHF: HD_SCSICMD tried on regular HDF, unit %d", unit);
+ write_log ("UAEHF: HD_SCSICMD tried on regular HDF, unit %d\n", unit);
}
break;
@@ -793,11 +797,20 @@
if ((request = hfpd->d_request[i]))
abort_async (hfpd, request, 0, 0);
}
+
+ write_comm_pipe_u32 (&hfpd->requests, 0, 1);
+ uae_sem_wait (&hfpd->sync_sem);
}
+
memset (hfpd, 0, sizeof (struct hardfileprivdata));
}
}
+void hardfile_cleanup (void)
+{
+ hardfile_reset ();
+}
+
void hardfile_install (void)
{
uae_u32 functable, datatable;
e-uae-0.8.29-irqfixes.patch:
--- NEW FILE e-uae-0.8.29-irqfixes.patch ---
--- e-uae-0.8.29-WIP4/src/custom.c.orig 2007-03-12 20:21:12.000000000 +0000
+++ e-uae-0.8.29-WIP4/src/custom.c 2008-03-20 23:04:57.000000000 +0000
@@ -2550,86 +2550,103 @@
#ifdef CPUEMU_6
-static int irq_pending[15]; /* If true, an IRQ is pending arrival at the CPU. */
-static unsigned long irq_due[15]; /* Cycle time that IRQ will arrive at CPU */
+static int irq_pending[15]; /* If true, an IRQ is pending arrival at the CPU. If false,
+ * an IRQ has arrived or is disabled. */
+static unsigned long irq_time[15]; /* Cycle time an IRQ will arrive at the CPU if that IRQ is
+ * pending or has arrived; otherwise 0, if an IRQ is disabled. */
/*
- * Handle interrupt delay in cycle-exact mode.
+ * Get priority level of IRQ (cycle-exact mode)
*/
-static int intlev_2 (void)
+STATIC_INLINE int intlev_exact (uae_u16 imask)
{
- uae_u16 imask = intreq & intena;
- int il = -1;
-
- if (imask && (intena & 0x4000)) {
- unsigned long cycles = get_cycles ();
- int i;
+#if 0
+ assert ((imask & 0x7FFF) != 0);
+#endif
- for (i = 14; i >= 0; i--) {
- if (imask & (1 << i)) {
- if (irq_pending[i] && (cycles >= irq_due[i])) {
- irq_pending[i] = 0;
+ unsigned long curr_time = get_cycles ();
+ int i;
- if (i == 13 || i == 14)
- il = -1;
- else if (i == 11 || i == 12)
- return 5;
- else if (i >= 7 && i <= 10)
- return 4;
- else if (i >= 4 && i <= 6)
- return 3;
- else if (i == 3)
- return 2;
- else
- return 1;
- }
+ for (i = 14; i >= 0; i--) {
+ if (imask & (1 << i)) {
+ if (irq_pending[i] == 0 || ((curr_time - irq_time[i]) > 4 * CYCLE_UNIT)) {
+ /* Mark IRQ as arrived. */
+ irq_pending[i] = 0;
+
+ /* Get priority level of IRQ. */
+ if (i == 13 || i == 14)
+ return 6;
+ if (i == 11 || i == 12)
+ return 5;
+ if (i >= 7 && i <= 10)
+ return 4;
+ if (i >= 4 && i <= 6)
+ return 3;
+ if (i == 3)
+ return 2;
+ else
+ return 1;
}
}
- } else
- unset_special (®s, SPCFLAG_INT);
-
- return il;
+ }
+ /* If we got here, then an at least one IRQ must be pending,
+ * but has not yet arrived at the CPU. */
+ return 0;
}
#endif
/*
- * Get interrupt level of IRQ.
+ * Get priority level of IRQ (not cycle-exact mode)
+ */
+STATIC_INLINE int intlev_simple (uae_u16 imask)
+{
+#if 0
+ assert ((imask & 0x7FFF) != 0);
+#endif
+
+ if (imask & 0x6000)
+ return 6;
+ if (imask & 0x1800)
+ return 5;
+ if (imask & 0x0780)
+ return 4;
+ if (imask & 0x0070)
+ return 3;
+ if (imask & 0x0008)
+ return 2;
+ else
+ return 1;
+}
+
+/*
+ * Get level of interrupt request presented to CPU.
+ *
+ * If no IRQs are active and enabled, returns -1.
+ * If none of the active IRQs have yet reached the CPU, returns 0.
+ * Otherwise, returns the priority level of the highest priorty active IRQ.
*/
int intlev (void)
{
- int il = -1;
+ uae_u16 imask = intreq & intena;
+ if (imask && (intena & 0x4000)) {
#ifdef CPUEMU_6
- if (currprefs.cpu_cycle_exact) {
- il = intlev_2 ();
- if (il >= 0 && il <= (int) regs.intmask)
- unset_special (®s, SPCFLAG_INT);
- } else
+ if (currprefs.cpu_cycle_exact)
+ return intlev_exact (imask);
+ else
#endif
- {
- uae_u16 imask = intreq & intena;
- if (imask && (intena & 0x4000)) {
- if (imask & 0x6000)
- il = 6;
- if (imask & 0x1800)
- il = 5;
- if (imask & 0x0780)
- il = 4;
- if (imask & 0x0070)
- il = 3;
- if (imask & 0x0008)
- il = 2;
- if (imask & 0x0007)
- il = 1;
- }
+ return intlev_simple (imask);
}
-
- return il;
+ return -1;
}
+/*
+ * Enable/disable an IRQ.
+ */
static void doint (void)
{
- set_special (®s, SPCFLAG_INT);
+ if (intena & 0x4000)
+ set_special (®s, SPCFLAG_INT);
#ifdef CPUEMU_6
if (currprefs.cpu_cycle_exact) {
@@ -2639,12 +2656,12 @@
imask = intreq & intena;
if (imask && (intena & 0x4000)) {
- /* Set up delay for IRQ to arrive at the CPU. */
- unsigned long cycle_irq_due = get_cycles () + 4 * CYCLE_UNIT;
+ /* Set up time for IRQ to arrive at the CPU. */
+ unsigned long curr_time = get_cycles ();
for (i = 0; i < 15; i++) {
if ((imask & (1 << i)) && irq_pending[i] == 0) {
irq_pending[i] = 1;
- irq_due[i] = cycle_irq_due;
+ irq_time[i] = curr_time;
}
}
}
@@ -2677,14 +2694,17 @@
* pending status. */
int i;
for (i = 0; i < 15; i++) {
- if (v & (1 << i))
+ if (v & (1 << i)) {
irq_pending[i] = 0;
+ irq_time[i] = 0;
+ }
}
}
}
#endif
- doint ();
+ if (intena & 0x4000)
+ doint ();
}
void INTREQ (uae_u16 v)
--- e-uae-0.8.29-WIP4/src/newcpu.c.orig 2007-03-28 02:27:18.000000000 +0100
+++ e-uae-0.8.29-WIP4/src/newcpu.c 2008-03-20 23:07:47.000000000 +0000
@@ -687,7 +687,10 @@
}
}
+ /* Interrupt priority level may have changed. Assert SPCFLAG_INT
+ * to check if there's an IRQ ready to go at the new level. */
set_special (regs, SPCFLAG_INT);
+
if (regs->t1 || regs->t0)
set_special (regs, SPCFLAG_TRACE);
else
@@ -973,15 +976,12 @@
STATIC_INLINE void service_interrupt (unsigned int level, struct regstruct *regs)
{
- if (level > regs->intmask) {
-
- regs->stopped = 0;
- unset_special (regs, SPCFLAG_STOP);
+ regs->stopped = 0;
+ unset_special (regs, SPCFLAG_STOP);
- Exception (level + 24, regs, 0);
+ Exception (level + 24, regs, 0);
- regs->intmask = level;
- }
+ regs->intmask = level;
}
/*
@@ -1694,12 +1694,14 @@
* In non-cycle-exact mode we handle this by separating the interrupt request
* pending (SPCFLAG_INT) and interrupt request arrived (SPCFLAG_DOINT) events.
* This ensures that there's always a delay of one opcode (and so at least 2
- * machine cycles) between the interrupt controller requesting an interrupt
- * and us servicing it here.
+ * machine cycles) between the interrupt controller requesting an interrupt or
+ * the processor changing its interrupt priority level and us servicing it here.
*
* In cycle-exact mode, there's just one event (SPCFLAG_INT) and the delay is
* handled internally by the interrupt controller code in custom.c - intlev()
* and friends.
+ *
+ * This stuff needs some tidying up!
*/
if ((regs->spcflags & SPCFLAG_DOINT) ||
(currprefs.cpu_cycle_exact && (regs->spcflags & SPCFLAG_INT))) {
@@ -1708,8 +1710,15 @@
unset_special (regs, SPCFLAG_DOINT);
- if (intr != -1)
+ if (intr > (int)regs->intmask) {
+ if (currprefs.cpu_cycle_exact)
+ unset_special(regs, SPCFLAG_INT);
+
service_interrupt (intr, regs);
+ } else {
+ if (intr < 0 && currprefs.cpu_cycle_exact)
+ unset_special (regs, SPCFLAG_INT);
+ }
}
if ((regs->spcflags & SPCFLAG_INT) && !currprefs.cpu_cycle_exact) {
--- NEW FILE e-uae.spec ---
Name: e-uae
Version: 0.8.29
Release: 0.10.wip4%{?dist}
Summary: A powerful Amiga Emulator, based on UAE
Group: Applications/Emulators
License: GPLv2+
URL: http://www.rcdrummond.net/uae/
Source0: http://www.rcdrummond.net/uae/%{name}-%{version}-WIP4/%{name}-%{version}-...
Source1: %{name}.png
Patch0: %{name}-0.8.29-irqfixes.patch
Patch1: %{name}-0.8.29-hardfilefixes.patch
# patch from upstream not to require an executable stack
Patch2: %{name}-0.8.29-execstack.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel => 2.0.0
BuildRequires: libcapsimage-devel => 2.0.0
BuildRequires: libICE-devel
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
BuildRequires: SDL-devel => 1.2.0
BuildRequires: zlib-devel
Requires: hicolor-icon-theme
Requires: policycoreutils
%description
E-UAE is an Amiga Emulator based on UAE which attempts to bring all the
features of WinUAE to non Windows platforms. E-UAE includes almost
complete emulation of the custom chips, including AGA, bsdsocket
emulation, JIT compilation for X86 processors, emulation of the 68000 to
the 68060 as well as the FPUs.
%prep
%setup -q -n %{name}-%{version}-WIP4
%patch0 -p1
%patch1 -p1
%patch2 -p1
# Encoding fixes
iconv -f iso8859-1 ChangeLog -t utf8 > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog
# Permission fixes
chmod -x src/crc32.c
%build
# Flag notes
# --enable-jit : Defaults to enabled on X86
# --enable-natmem : Defaults to enabled on Linux/X86
# --enable-autoconfig : Defaults to enabled if threading available (should be)
# --enable-aga : Defaults to true
# --enable-cdtv : Defaults to true if SCSI is enabled.
# --enable-cd32 : Defaults to true if AGA and SCSI is enabled
# --enable-action-replay : Defaults to true
# --enable-cycle-exact-cpu : Defaults to true
# --enable-compatible-cpu : Defaults to true
# --enable-natmem : Defaults to yes on Linux
# --enable-autoconfig : Defaults to yes if threads enabled (they should be)
# --enable-fdi : Defaults to on
%configure --enable-bsdsock-new \
--enable-ui \
--enable-audio \
--with-caps \
--with-caps-prefix=/usr \
--with-sdl \
--with-sdl-gfx \
--with-sdl-sound
# Don't use parallel building (%%{?_smp_mflags}) seems broken in some cases
make
# Build desktop icon
cat >%{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=E-UAE
GenericName=Amiga Emulator
Comment=UNIX Amiga Emulator
Exec=uae
Icon=%{name}
Terminal=false
Type=Application
Categories=Game;Emulator;
EOF
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
desktop-file-install --vendor dribble \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
%clean
rm -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
# SELinux support
%ifarch %{ix86}
semanage fcontext -a -t java_exec_t %{_bindir}/uae >/dev/null 2>&1 || :
restorecon -R %{_bindir}/uae
%endif
%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
# SELinux support
%ifarch %{ix86}
if [ "$1" -eq "0" ]; then
semanage fcontext -d -t java_exec_t %{_bindir}/uae >/dev/null 2>&1 || :
fi
%endif
%files
%defattr(-,root,root,-)
%{_bindir}/uae
%{_bindir}/readdisk
%{_datadir}/applications/dribble-e-uae.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%doc docs/* ChangeLog COPYING README
%changelog
* Sun Oct 05 2008 Andrea Musuruane <musuruan(a)gmail.com> 0.8.29-0.10.wip4
- addedd a patch from upstream not to require an executable stack
- added an SELinux context because uae requires an executable heap
* Fri Mar 21 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.9.wip4
- Add support for libcapsimage to x86_64
- Added patch for various IRQ handling fixes
- Added patch for fixing hardfile related race condition
- Convert ChangeLog to UTF8
- License change due to new guidelines
* Sat Mar 31 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.8.wip4
- Upgrade to 0.8.29-WIP4
* Tue Mar 13 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.7.wip3
- Dropped dribble-menus requirement, due to be obsoleted
- Changed .desktop category to Game;Emulator;
* Thu Jan 25 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.6.wip3
- Various spec cleanups
- Dropped support for FC4
- Renamed icon and .desktop file
* Wed Aug 02 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.5.wip3
- Upgraded to 0.8.29-WIP3
* Sun Jul 09 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.4.wip2
- Moved icon installation to make it freedesktop compliant
- Added %%post and %%postun sections to update icon cache at installation
* Sat Jun 24 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.3.wip2
- Cosmetic fixes for the Dribble repository
- Rebuilt ensuring libICE support
- Moved .desktop file creation to build section
* Wed May 31 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.2.wip2
- Corrected release name format to 0.%%{X}.%%{alphatag} from 0.%%{alphatag}.%%{X}
- Added %%{version}-%%{release} to provides field
- Dropped gawk as a buildrequire. Doesn't seem to be needed.
- Dropped xorg-x11-devel as a buildrequire. SDL-devel should pull in needed X
headers and this should make it compatible with both modular/non-modular X
- Added ncurses-devel as a buildrequire
- Added pkgconfig as a buildrequire
- Disabled parallel make as it currently seems to be broken.
- Cosmetic changes to the configure section. Makes it less verbose.
* Sat May 06 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.WIP2.1.iss
- Upgraded to 0.8.29-WIP2
- Spec file changed to more closely follow Fedora packaging guidelines
- Amiga specific tools removed
- Added gawk, xorg-x11-devel, desktop-file-utils buildrequires
- Removed file from buildrequires as per packaging guidelines
- Added x86_64 support, minus caps stuff as it's not available for x86_64
* Mon Oct 24 2005 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.28-1.iss
- Upgraded to 0.8.28
- Fixes for deprecated fields no longer supported by the latest rpmbuild
- Now compiled against SDL as the FC2 arts/SDL bug appears fixed.
- Compiled on PPC
- SCSI emulation removed.
* Sun Jan 23 2005 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.27-2.iss
- Upgraded to the final version of 0.8.27 instead of RC2
- Now compiled against alsa as it supports it natively.
- Added scsi emulation support.
- CD32 emulation now enabled as it required scsi-emulation support
- CDTV emulation now enabled as it required scsi-emulation support
* Tue Nov 30 2004 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.27-1.iss
- Initial Release
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/e-uae/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 15:33:09 -0000 1.1
+++ .cvsignore 16 Oct 2008 17:46:31 -0000 1.2
@@ -0,0 +1 @@
+e-uae-0.8.29-WIP4.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/e-uae/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 15:33:09 -0000 1.1
+++ sources 16 Oct 2008 17:46:31 -0000 1.2
@@ -0,0 +1 @@
+cbfd7e3d7a1b323331afbb92ea7ff4f0 e-uae-0.8.29-WIP4.tar.bz2
16 years
- 1
- 0
rpms/e-uae/F-9 e-uae-0.8.29-execstack.patch, NONE, 1.1 e-uae-0.8.29-hardfilefixes.patch, NONE, 1.1 e-uae-0.8.29-irqfixes.patch, NONE, 1.1 e-uae.png, NONE, 1.1 e-uae.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/e-uae/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27921/F-9
Modified Files:
.cvsignore sources
Added Files:
e-uae-0.8.29-execstack.patch e-uae-0.8.29-hardfilefixes.patch
e-uae-0.8.29-irqfixes.patch e-uae.png e-uae.spec
Log Message:
First import
e-uae-0.8.29-execstack.patch:
--- NEW FILE e-uae-0.8.29-execstack.patch ---
Only in e-uae-0.8.29-WIP4: autom4te.cache
diff -dur e-uae-0.8.29-WIP4.orig/configure e-uae-0.8.29-WIP4/configure
--- e-uae-0.8.29-WIP4.orig/configure 2007-03-28 06:20:21.000000000 +0200
+++ e-uae-0.8.29-WIP4/configure 2008-08-15 10:27:51.000000000 +0200
@@ -18154,57 +18154,6 @@
fi
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
-
- { echo "$as_me:$LINENO: checking whether assembler supports --execstack option" >&5
-echo $ECHO_N "checking whether assembler supports --execstack option... $ECHO_C" >&6; }
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="-Wa,--execstack $CFLAGS"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-int main (void) {return 0;}
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- UAE_CFLAGS="-Wa,--execstack $UAE_CFLAGS"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$SAVE_CFLAGS"
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
diff -dur e-uae-0.8.29-WIP4.orig/configure.in e-uae-0.8.29-WIP4/configure.in
--- e-uae-0.8.29-WIP4.orig/configure.in 2007-03-28 03:41:28.000000000 +0200
+++ e-uae-0.8.29-WIP4/configure.in 2008-08-15 10:25:42.000000000 +0200
@@ -762,16 +762,6 @@
fi
fi
AC_MSG_RESULT(yes)
-
- AC_MSG_CHECKING([whether assembler supports --execstack option])
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="-Wa,--execstack $CFLAGS"
- AC_TRY_COMPILE(, int main (void) {return 0;},
- [AC_MSG_RESULT(yes)
- UAE_CFLAGS="-Wa,--execstack $UAE_CFLAGS"],
- AC_MSG_RESULT(no)
- )
- CFLAGS="$SAVE_CFLAGS"
else
AC_MSG_RESULT(no)
fi
e-uae-0.8.29-hardfilefixes.patch:
--- NEW FILE e-uae-0.8.29-hardfilefixes.patch ---
--- e-uae-0.8.29-WIP4/src/hardfile.c.orig 2007-03-12 20:21:13.000000000 +0000
+++ e-uae-0.8.29-WIP4/src/hardfile.c 2008-03-21 02:10:49.000000000 +0000
@@ -432,8 +432,12 @@
if (!hfpd->opencount)
return 0;
hfpd->opencount--;
- if (hfpd->opencount == 0)
+
+ if (hfpd->opencount == 0) {
write_comm_pipe_u32 (&hfpd->requests, 0, 1);
+ uae_sem_wait (&hfpd->sync_sem);
+ }
+
put_word (m68k_areg (&context->regs, 6) + 32, get_word (m68k_areg (&context->regs, 6) + 32) - 1);
return 0;
}
@@ -663,7 +667,7 @@
error = handle_scsi (request, hfd);
} else { /* we don't want users trashing their "partition" hardfiles with hdtoolbox */
error = -3; /* IOERR_NOCMD */
- write_log ("UAEHF: HD_SCSICMD tried on regular HDF, unit %d", unit);
+ write_log ("UAEHF: HD_SCSICMD tried on regular HDF, unit %d\n", unit);
}
break;
@@ -793,11 +797,20 @@
if ((request = hfpd->d_request[i]))
abort_async (hfpd, request, 0, 0);
}
+
+ write_comm_pipe_u32 (&hfpd->requests, 0, 1);
+ uae_sem_wait (&hfpd->sync_sem);
}
+
memset (hfpd, 0, sizeof (struct hardfileprivdata));
}
}
+void hardfile_cleanup (void)
+{
+ hardfile_reset ();
+}
+
void hardfile_install (void)
{
uae_u32 functable, datatable;
e-uae-0.8.29-irqfixes.patch:
--- NEW FILE e-uae-0.8.29-irqfixes.patch ---
--- e-uae-0.8.29-WIP4/src/custom.c.orig 2007-03-12 20:21:12.000000000 +0000
+++ e-uae-0.8.29-WIP4/src/custom.c 2008-03-20 23:04:57.000000000 +0000
@@ -2550,86 +2550,103 @@
#ifdef CPUEMU_6
-static int irq_pending[15]; /* If true, an IRQ is pending arrival at the CPU. */
-static unsigned long irq_due[15]; /* Cycle time that IRQ will arrive at CPU */
+static int irq_pending[15]; /* If true, an IRQ is pending arrival at the CPU. If false,
+ * an IRQ has arrived or is disabled. */
+static unsigned long irq_time[15]; /* Cycle time an IRQ will arrive at the CPU if that IRQ is
+ * pending or has arrived; otherwise 0, if an IRQ is disabled. */
/*
- * Handle interrupt delay in cycle-exact mode.
+ * Get priority level of IRQ (cycle-exact mode)
*/
-static int intlev_2 (void)
+STATIC_INLINE int intlev_exact (uae_u16 imask)
{
- uae_u16 imask = intreq & intena;
- int il = -1;
-
- if (imask && (intena & 0x4000)) {
- unsigned long cycles = get_cycles ();
- int i;
+#if 0
+ assert ((imask & 0x7FFF) != 0);
+#endif
- for (i = 14; i >= 0; i--) {
- if (imask & (1 << i)) {
- if (irq_pending[i] && (cycles >= irq_due[i])) {
- irq_pending[i] = 0;
+ unsigned long curr_time = get_cycles ();
+ int i;
- if (i == 13 || i == 14)
- il = -1;
- else if (i == 11 || i == 12)
- return 5;
- else if (i >= 7 && i <= 10)
- return 4;
- else if (i >= 4 && i <= 6)
- return 3;
- else if (i == 3)
- return 2;
- else
- return 1;
- }
+ for (i = 14; i >= 0; i--) {
+ if (imask & (1 << i)) {
+ if (irq_pending[i] == 0 || ((curr_time - irq_time[i]) > 4 * CYCLE_UNIT)) {
+ /* Mark IRQ as arrived. */
+ irq_pending[i] = 0;
+
+ /* Get priority level of IRQ. */
+ if (i == 13 || i == 14)
+ return 6;
+ if (i == 11 || i == 12)
+ return 5;
+ if (i >= 7 && i <= 10)
+ return 4;
+ if (i >= 4 && i <= 6)
+ return 3;
+ if (i == 3)
+ return 2;
+ else
+ return 1;
}
}
- } else
- unset_special (®s, SPCFLAG_INT);
-
- return il;
+ }
+ /* If we got here, then an at least one IRQ must be pending,
+ * but has not yet arrived at the CPU. */
+ return 0;
}
#endif
/*
- * Get interrupt level of IRQ.
+ * Get priority level of IRQ (not cycle-exact mode)
+ */
+STATIC_INLINE int intlev_simple (uae_u16 imask)
+{
+#if 0
+ assert ((imask & 0x7FFF) != 0);
+#endif
+
+ if (imask & 0x6000)
+ return 6;
+ if (imask & 0x1800)
+ return 5;
+ if (imask & 0x0780)
+ return 4;
+ if (imask & 0x0070)
+ return 3;
+ if (imask & 0x0008)
+ return 2;
+ else
+ return 1;
+}
+
+/*
+ * Get level of interrupt request presented to CPU.
+ *
+ * If no IRQs are active and enabled, returns -1.
+ * If none of the active IRQs have yet reached the CPU, returns 0.
+ * Otherwise, returns the priority level of the highest priorty active IRQ.
*/
int intlev (void)
{
- int il = -1;
+ uae_u16 imask = intreq & intena;
+ if (imask && (intena & 0x4000)) {
#ifdef CPUEMU_6
- if (currprefs.cpu_cycle_exact) {
- il = intlev_2 ();
- if (il >= 0 && il <= (int) regs.intmask)
- unset_special (®s, SPCFLAG_INT);
- } else
+ if (currprefs.cpu_cycle_exact)
+ return intlev_exact (imask);
+ else
#endif
- {
- uae_u16 imask = intreq & intena;
- if (imask && (intena & 0x4000)) {
- if (imask & 0x6000)
- il = 6;
- if (imask & 0x1800)
- il = 5;
- if (imask & 0x0780)
- il = 4;
- if (imask & 0x0070)
- il = 3;
- if (imask & 0x0008)
- il = 2;
- if (imask & 0x0007)
- il = 1;
- }
+ return intlev_simple (imask);
}
-
- return il;
+ return -1;
}
+/*
+ * Enable/disable an IRQ.
+ */
static void doint (void)
{
- set_special (®s, SPCFLAG_INT);
+ if (intena & 0x4000)
+ set_special (®s, SPCFLAG_INT);
#ifdef CPUEMU_6
if (currprefs.cpu_cycle_exact) {
@@ -2639,12 +2656,12 @@
imask = intreq & intena;
if (imask && (intena & 0x4000)) {
- /* Set up delay for IRQ to arrive at the CPU. */
- unsigned long cycle_irq_due = get_cycles () + 4 * CYCLE_UNIT;
+ /* Set up time for IRQ to arrive at the CPU. */
+ unsigned long curr_time = get_cycles ();
for (i = 0; i < 15; i++) {
if ((imask & (1 << i)) && irq_pending[i] == 0) {
irq_pending[i] = 1;
- irq_due[i] = cycle_irq_due;
+ irq_time[i] = curr_time;
}
}
}
@@ -2677,14 +2694,17 @@
* pending status. */
int i;
for (i = 0; i < 15; i++) {
- if (v & (1 << i))
+ if (v & (1 << i)) {
irq_pending[i] = 0;
+ irq_time[i] = 0;
+ }
}
}
}
#endif
- doint ();
+ if (intena & 0x4000)
+ doint ();
}
void INTREQ (uae_u16 v)
--- e-uae-0.8.29-WIP4/src/newcpu.c.orig 2007-03-28 02:27:18.000000000 +0100
+++ e-uae-0.8.29-WIP4/src/newcpu.c 2008-03-20 23:07:47.000000000 +0000
@@ -687,7 +687,10 @@
}
}
+ /* Interrupt priority level may have changed. Assert SPCFLAG_INT
+ * to check if there's an IRQ ready to go at the new level. */
set_special (regs, SPCFLAG_INT);
+
if (regs->t1 || regs->t0)
set_special (regs, SPCFLAG_TRACE);
else
@@ -973,15 +976,12 @@
STATIC_INLINE void service_interrupt (unsigned int level, struct regstruct *regs)
{
- if (level > regs->intmask) {
-
- regs->stopped = 0;
- unset_special (regs, SPCFLAG_STOP);
+ regs->stopped = 0;
+ unset_special (regs, SPCFLAG_STOP);
- Exception (level + 24, regs, 0);
+ Exception (level + 24, regs, 0);
- regs->intmask = level;
- }
+ regs->intmask = level;
}
/*
@@ -1694,12 +1694,14 @@
* In non-cycle-exact mode we handle this by separating the interrupt request
* pending (SPCFLAG_INT) and interrupt request arrived (SPCFLAG_DOINT) events.
* This ensures that there's always a delay of one opcode (and so at least 2
- * machine cycles) between the interrupt controller requesting an interrupt
- * and us servicing it here.
+ * machine cycles) between the interrupt controller requesting an interrupt or
+ * the processor changing its interrupt priority level and us servicing it here.
*
* In cycle-exact mode, there's just one event (SPCFLAG_INT) and the delay is
* handled internally by the interrupt controller code in custom.c - intlev()
* and friends.
+ *
+ * This stuff needs some tidying up!
*/
if ((regs->spcflags & SPCFLAG_DOINT) ||
(currprefs.cpu_cycle_exact && (regs->spcflags & SPCFLAG_INT))) {
@@ -1708,8 +1710,15 @@
unset_special (regs, SPCFLAG_DOINT);
- if (intr != -1)
+ if (intr > (int)regs->intmask) {
+ if (currprefs.cpu_cycle_exact)
+ unset_special(regs, SPCFLAG_INT);
+
service_interrupt (intr, regs);
+ } else {
+ if (intr < 0 && currprefs.cpu_cycle_exact)
+ unset_special (regs, SPCFLAG_INT);
+ }
}
if ((regs->spcflags & SPCFLAG_INT) && !currprefs.cpu_cycle_exact) {
--- NEW FILE e-uae.spec ---
Name: e-uae
Version: 0.8.29
Release: 0.10.wip4%{?dist}
Summary: A powerful Amiga Emulator, based on UAE
Group: Applications/Emulators
License: GPLv2+
URL: http://www.rcdrummond.net/uae/
Source0: http://www.rcdrummond.net/uae/%{name}-%{version}-WIP4/%{name}-%{version}-...
Source1: %{name}.png
Patch0: %{name}-0.8.29-irqfixes.patch
Patch1: %{name}-0.8.29-hardfilefixes.patch
# patch from upstream not to require an executable stack
Patch2: %{name}-0.8.29-execstack.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel => 2.0.0
BuildRequires: libcapsimage-devel => 2.0.0
BuildRequires: libICE-devel
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
BuildRequires: SDL-devel => 1.2.0
BuildRequires: zlib-devel
Requires: hicolor-icon-theme
Requires: policycoreutils
%description
E-UAE is an Amiga Emulator based on UAE which attempts to bring all the
features of WinUAE to non Windows platforms. E-UAE includes almost
complete emulation of the custom chips, including AGA, bsdsocket
emulation, JIT compilation for X86 processors, emulation of the 68000 to
the 68060 as well as the FPUs.
%prep
%setup -q -n %{name}-%{version}-WIP4
%patch0 -p1
%patch1 -p1
%patch2 -p1
# Encoding fixes
iconv -f iso8859-1 ChangeLog -t utf8 > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog
# Permission fixes
chmod -x src/crc32.c
%build
# Flag notes
# --enable-jit : Defaults to enabled on X86
# --enable-natmem : Defaults to enabled on Linux/X86
# --enable-autoconfig : Defaults to enabled if threading available (should be)
# --enable-aga : Defaults to true
# --enable-cdtv : Defaults to true if SCSI is enabled.
# --enable-cd32 : Defaults to true if AGA and SCSI is enabled
# --enable-action-replay : Defaults to true
# --enable-cycle-exact-cpu : Defaults to true
# --enable-compatible-cpu : Defaults to true
# --enable-natmem : Defaults to yes on Linux
# --enable-autoconfig : Defaults to yes if threads enabled (they should be)
# --enable-fdi : Defaults to on
%configure --enable-bsdsock-new \
--enable-ui \
--enable-audio \
--with-caps \
--with-caps-prefix=/usr \
--with-sdl \
--with-sdl-gfx \
--with-sdl-sound
# Don't use parallel building (%%{?_smp_mflags}) seems broken in some cases
make
# Build desktop icon
cat >%{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=E-UAE
GenericName=Amiga Emulator
Comment=UNIX Amiga Emulator
Exec=uae
Icon=%{name}
Terminal=false
Type=Application
Categories=Game;Emulator;
EOF
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
desktop-file-install --vendor dribble \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
%clean
rm -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
# SELinux support
%ifarch %{ix86}
semanage fcontext -a -t java_exec_t %{_bindir}/uae >/dev/null 2>&1 || :
restorecon -R %{_bindir}/uae
%endif
%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
# SELinux support
%ifarch %{ix86}
if [ "$1" -eq "0" ]; then
semanage fcontext -d -t java_exec_t %{_bindir}/uae >/dev/null 2>&1 || :
fi
%endif
%files
%defattr(-,root,root,-)
%{_bindir}/uae
%{_bindir}/readdisk
%{_datadir}/applications/dribble-e-uae.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%doc docs/* ChangeLog COPYING README
%changelog
* Sun Oct 05 2008 Andrea Musuruane <musuruan(a)gmail.com> 0.8.29-0.10.wip4
- addedd a patch from upstream not to require an executable stack
- added an SELinux context because uae requires an executable heap
* Fri Mar 21 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.9.wip4
- Add support for libcapsimage to x86_64
- Added patch for various IRQ handling fixes
- Added patch for fixing hardfile related race condition
- Convert ChangeLog to UTF8
- License change due to new guidelines
* Sat Mar 31 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.8.wip4
- Upgrade to 0.8.29-WIP4
* Tue Mar 13 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.7.wip3
- Dropped dribble-menus requirement, due to be obsoleted
- Changed .desktop category to Game;Emulator;
* Thu Jan 25 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.6.wip3
- Various spec cleanups
- Dropped support for FC4
- Renamed icon and .desktop file
* Wed Aug 02 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.5.wip3
- Upgraded to 0.8.29-WIP3
* Sun Jul 09 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.4.wip2
- Moved icon installation to make it freedesktop compliant
- Added %%post and %%postun sections to update icon cache at installation
* Sat Jun 24 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.3.wip2
- Cosmetic fixes for the Dribble repository
- Rebuilt ensuring libICE support
- Moved .desktop file creation to build section
* Wed May 31 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.2.wip2
- Corrected release name format to 0.%%{X}.%%{alphatag} from 0.%%{alphatag}.%%{X}
- Added %%{version}-%%{release} to provides field
- Dropped gawk as a buildrequire. Doesn't seem to be needed.
- Dropped xorg-x11-devel as a buildrequire. SDL-devel should pull in needed X
headers and this should make it compatible with both modular/non-modular X
- Added ncurses-devel as a buildrequire
- Added pkgconfig as a buildrequire
- Disabled parallel make as it currently seems to be broken.
- Cosmetic changes to the configure section. Makes it less verbose.
* Sat May 06 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.WIP2.1.iss
- Upgraded to 0.8.29-WIP2
- Spec file changed to more closely follow Fedora packaging guidelines
- Amiga specific tools removed
- Added gawk, xorg-x11-devel, desktop-file-utils buildrequires
- Removed file from buildrequires as per packaging guidelines
- Added x86_64 support, minus caps stuff as it's not available for x86_64
* Mon Oct 24 2005 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.28-1.iss
- Upgraded to 0.8.28
- Fixes for deprecated fields no longer supported by the latest rpmbuild
- Now compiled against SDL as the FC2 arts/SDL bug appears fixed.
- Compiled on PPC
- SCSI emulation removed.
* Sun Jan 23 2005 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.27-2.iss
- Upgraded to the final version of 0.8.27 instead of RC2
- Now compiled against alsa as it supports it natively.
- Added scsi emulation support.
- CD32 emulation now enabled as it required scsi-emulation support
- CDTV emulation now enabled as it required scsi-emulation support
* Tue Nov 30 2004 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.27-1.iss
- Initial Release
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/e-uae/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 15:33:09 -0000 1.1
+++ .cvsignore 16 Oct 2008 17:45:15 -0000 1.2
@@ -0,0 +1 @@
+e-uae-0.8.29-WIP4.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/e-uae/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 15:33:09 -0000 1.1
+++ sources 16 Oct 2008 17:45:15 -0000 1.2
@@ -0,0 +1 @@
+cbfd7e3d7a1b323331afbb92ea7ff4f0 e-uae-0.8.29-WIP4.tar.bz2
16 years
- 1
- 0
rpms/e-uae/devel e-uae-0.8.29-execstack.patch, NONE, 1.1 e-uae-0.8.29-hardfilefixes.patch, NONE, 1.1 e-uae-0.8.29-irqfixes.patch, NONE, 1.1 e-uae.png, NONE, 1.1 e-uae.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/e-uae/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27645/devel
Modified Files:
.cvsignore sources
Added Files:
e-uae-0.8.29-execstack.patch e-uae-0.8.29-hardfilefixes.patch
e-uae-0.8.29-irqfixes.patch e-uae.png e-uae.spec
Log Message:
First import
e-uae-0.8.29-execstack.patch:
--- NEW FILE e-uae-0.8.29-execstack.patch ---
Only in e-uae-0.8.29-WIP4: autom4te.cache
diff -dur e-uae-0.8.29-WIP4.orig/configure e-uae-0.8.29-WIP4/configure
--- e-uae-0.8.29-WIP4.orig/configure 2007-03-28 06:20:21.000000000 +0200
+++ e-uae-0.8.29-WIP4/configure 2008-08-15 10:27:51.000000000 +0200
@@ -18154,57 +18154,6 @@
fi
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
-
- { echo "$as_me:$LINENO: checking whether assembler supports --execstack option" >&5
-echo $ECHO_N "checking whether assembler supports --execstack option... $ECHO_C" >&6; }
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="-Wa,--execstack $CFLAGS"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-int main (void) {return 0;}
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- UAE_CFLAGS="-Wa,--execstack $UAE_CFLAGS"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$SAVE_CFLAGS"
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
diff -dur e-uae-0.8.29-WIP4.orig/configure.in e-uae-0.8.29-WIP4/configure.in
--- e-uae-0.8.29-WIP4.orig/configure.in 2007-03-28 03:41:28.000000000 +0200
+++ e-uae-0.8.29-WIP4/configure.in 2008-08-15 10:25:42.000000000 +0200
@@ -762,16 +762,6 @@
fi
fi
AC_MSG_RESULT(yes)
-
- AC_MSG_CHECKING([whether assembler supports --execstack option])
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="-Wa,--execstack $CFLAGS"
- AC_TRY_COMPILE(, int main (void) {return 0;},
- [AC_MSG_RESULT(yes)
- UAE_CFLAGS="-Wa,--execstack $UAE_CFLAGS"],
- AC_MSG_RESULT(no)
- )
- CFLAGS="$SAVE_CFLAGS"
else
AC_MSG_RESULT(no)
fi
e-uae-0.8.29-hardfilefixes.patch:
--- NEW FILE e-uae-0.8.29-hardfilefixes.patch ---
--- e-uae-0.8.29-WIP4/src/hardfile.c.orig 2007-03-12 20:21:13.000000000 +0000
+++ e-uae-0.8.29-WIP4/src/hardfile.c 2008-03-21 02:10:49.000000000 +0000
@@ -432,8 +432,12 @@
if (!hfpd->opencount)
return 0;
hfpd->opencount--;
- if (hfpd->opencount == 0)
+
+ if (hfpd->opencount == 0) {
write_comm_pipe_u32 (&hfpd->requests, 0, 1);
+ uae_sem_wait (&hfpd->sync_sem);
+ }
+
put_word (m68k_areg (&context->regs, 6) + 32, get_word (m68k_areg (&context->regs, 6) + 32) - 1);
return 0;
}
@@ -663,7 +667,7 @@
error = handle_scsi (request, hfd);
} else { /* we don't want users trashing their "partition" hardfiles with hdtoolbox */
error = -3; /* IOERR_NOCMD */
- write_log ("UAEHF: HD_SCSICMD tried on regular HDF, unit %d", unit);
+ write_log ("UAEHF: HD_SCSICMD tried on regular HDF, unit %d\n", unit);
}
break;
@@ -793,11 +797,20 @@
if ((request = hfpd->d_request[i]))
abort_async (hfpd, request, 0, 0);
}
+
+ write_comm_pipe_u32 (&hfpd->requests, 0, 1);
+ uae_sem_wait (&hfpd->sync_sem);
}
+
memset (hfpd, 0, sizeof (struct hardfileprivdata));
}
}
+void hardfile_cleanup (void)
+{
+ hardfile_reset ();
+}
+
void hardfile_install (void)
{
uae_u32 functable, datatable;
e-uae-0.8.29-irqfixes.patch:
--- NEW FILE e-uae-0.8.29-irqfixes.patch ---
--- e-uae-0.8.29-WIP4/src/custom.c.orig 2007-03-12 20:21:12.000000000 +0000
+++ e-uae-0.8.29-WIP4/src/custom.c 2008-03-20 23:04:57.000000000 +0000
@@ -2550,86 +2550,103 @@
#ifdef CPUEMU_6
-static int irq_pending[15]; /* If true, an IRQ is pending arrival at the CPU. */
-static unsigned long irq_due[15]; /* Cycle time that IRQ will arrive at CPU */
+static int irq_pending[15]; /* If true, an IRQ is pending arrival at the CPU. If false,
+ * an IRQ has arrived or is disabled. */
+static unsigned long irq_time[15]; /* Cycle time an IRQ will arrive at the CPU if that IRQ is
+ * pending or has arrived; otherwise 0, if an IRQ is disabled. */
/*
- * Handle interrupt delay in cycle-exact mode.
+ * Get priority level of IRQ (cycle-exact mode)
*/
-static int intlev_2 (void)
+STATIC_INLINE int intlev_exact (uae_u16 imask)
{
- uae_u16 imask = intreq & intena;
- int il = -1;
-
- if (imask && (intena & 0x4000)) {
- unsigned long cycles = get_cycles ();
- int i;
+#if 0
+ assert ((imask & 0x7FFF) != 0);
+#endif
- for (i = 14; i >= 0; i--) {
- if (imask & (1 << i)) {
- if (irq_pending[i] && (cycles >= irq_due[i])) {
- irq_pending[i] = 0;
+ unsigned long curr_time = get_cycles ();
+ int i;
- if (i == 13 || i == 14)
- il = -1;
- else if (i == 11 || i == 12)
- return 5;
- else if (i >= 7 && i <= 10)
- return 4;
- else if (i >= 4 && i <= 6)
- return 3;
- else if (i == 3)
- return 2;
- else
- return 1;
- }
+ for (i = 14; i >= 0; i--) {
+ if (imask & (1 << i)) {
+ if (irq_pending[i] == 0 || ((curr_time - irq_time[i]) > 4 * CYCLE_UNIT)) {
+ /* Mark IRQ as arrived. */
+ irq_pending[i] = 0;
+
+ /* Get priority level of IRQ. */
+ if (i == 13 || i == 14)
+ return 6;
+ if (i == 11 || i == 12)
+ return 5;
+ if (i >= 7 && i <= 10)
+ return 4;
+ if (i >= 4 && i <= 6)
+ return 3;
+ if (i == 3)
+ return 2;
+ else
+ return 1;
}
}
- } else
- unset_special (®s, SPCFLAG_INT);
-
- return il;
+ }
+ /* If we got here, then an at least one IRQ must be pending,
+ * but has not yet arrived at the CPU. */
+ return 0;
}
#endif
/*
- * Get interrupt level of IRQ.
+ * Get priority level of IRQ (not cycle-exact mode)
+ */
+STATIC_INLINE int intlev_simple (uae_u16 imask)
+{
+#if 0
+ assert ((imask & 0x7FFF) != 0);
+#endif
+
+ if (imask & 0x6000)
+ return 6;
+ if (imask & 0x1800)
+ return 5;
+ if (imask & 0x0780)
+ return 4;
+ if (imask & 0x0070)
+ return 3;
+ if (imask & 0x0008)
+ return 2;
+ else
+ return 1;
+}
+
+/*
+ * Get level of interrupt request presented to CPU.
+ *
+ * If no IRQs are active and enabled, returns -1.
+ * If none of the active IRQs have yet reached the CPU, returns 0.
+ * Otherwise, returns the priority level of the highest priorty active IRQ.
*/
int intlev (void)
{
- int il = -1;
+ uae_u16 imask = intreq & intena;
+ if (imask && (intena & 0x4000)) {
#ifdef CPUEMU_6
- if (currprefs.cpu_cycle_exact) {
- il = intlev_2 ();
- if (il >= 0 && il <= (int) regs.intmask)
- unset_special (®s, SPCFLAG_INT);
- } else
+ if (currprefs.cpu_cycle_exact)
+ return intlev_exact (imask);
+ else
#endif
- {
- uae_u16 imask = intreq & intena;
- if (imask && (intena & 0x4000)) {
- if (imask & 0x6000)
- il = 6;
- if (imask & 0x1800)
- il = 5;
- if (imask & 0x0780)
- il = 4;
- if (imask & 0x0070)
- il = 3;
- if (imask & 0x0008)
- il = 2;
- if (imask & 0x0007)
- il = 1;
- }
+ return intlev_simple (imask);
}
-
- return il;
+ return -1;
}
+/*
+ * Enable/disable an IRQ.
+ */
static void doint (void)
{
- set_special (®s, SPCFLAG_INT);
+ if (intena & 0x4000)
+ set_special (®s, SPCFLAG_INT);
#ifdef CPUEMU_6
if (currprefs.cpu_cycle_exact) {
@@ -2639,12 +2656,12 @@
imask = intreq & intena;
if (imask && (intena & 0x4000)) {
- /* Set up delay for IRQ to arrive at the CPU. */
- unsigned long cycle_irq_due = get_cycles () + 4 * CYCLE_UNIT;
+ /* Set up time for IRQ to arrive at the CPU. */
+ unsigned long curr_time = get_cycles ();
for (i = 0; i < 15; i++) {
if ((imask & (1 << i)) && irq_pending[i] == 0) {
irq_pending[i] = 1;
- irq_due[i] = cycle_irq_due;
+ irq_time[i] = curr_time;
}
}
}
@@ -2677,14 +2694,17 @@
* pending status. */
int i;
for (i = 0; i < 15; i++) {
- if (v & (1 << i))
+ if (v & (1 << i)) {
irq_pending[i] = 0;
+ irq_time[i] = 0;
+ }
}
}
}
#endif
- doint ();
+ if (intena & 0x4000)
+ doint ();
}
void INTREQ (uae_u16 v)
--- e-uae-0.8.29-WIP4/src/newcpu.c.orig 2007-03-28 02:27:18.000000000 +0100
+++ e-uae-0.8.29-WIP4/src/newcpu.c 2008-03-20 23:07:47.000000000 +0000
@@ -687,7 +687,10 @@
}
}
+ /* Interrupt priority level may have changed. Assert SPCFLAG_INT
+ * to check if there's an IRQ ready to go at the new level. */
set_special (regs, SPCFLAG_INT);
+
if (regs->t1 || regs->t0)
set_special (regs, SPCFLAG_TRACE);
else
@@ -973,15 +976,12 @@
STATIC_INLINE void service_interrupt (unsigned int level, struct regstruct *regs)
{
- if (level > regs->intmask) {
-
- regs->stopped = 0;
- unset_special (regs, SPCFLAG_STOP);
+ regs->stopped = 0;
+ unset_special (regs, SPCFLAG_STOP);
- Exception (level + 24, regs, 0);
+ Exception (level + 24, regs, 0);
- regs->intmask = level;
- }
+ regs->intmask = level;
}
/*
@@ -1694,12 +1694,14 @@
* In non-cycle-exact mode we handle this by separating the interrupt request
* pending (SPCFLAG_INT) and interrupt request arrived (SPCFLAG_DOINT) events.
* This ensures that there's always a delay of one opcode (and so at least 2
- * machine cycles) between the interrupt controller requesting an interrupt
- * and us servicing it here.
+ * machine cycles) between the interrupt controller requesting an interrupt or
+ * the processor changing its interrupt priority level and us servicing it here.
*
* In cycle-exact mode, there's just one event (SPCFLAG_INT) and the delay is
* handled internally by the interrupt controller code in custom.c - intlev()
* and friends.
+ *
+ * This stuff needs some tidying up!
*/
if ((regs->spcflags & SPCFLAG_DOINT) ||
(currprefs.cpu_cycle_exact && (regs->spcflags & SPCFLAG_INT))) {
@@ -1708,8 +1710,15 @@
unset_special (regs, SPCFLAG_DOINT);
- if (intr != -1)
+ if (intr > (int)regs->intmask) {
+ if (currprefs.cpu_cycle_exact)
+ unset_special(regs, SPCFLAG_INT);
+
service_interrupt (intr, regs);
+ } else {
+ if (intr < 0 && currprefs.cpu_cycle_exact)
+ unset_special (regs, SPCFLAG_INT);
+ }
}
if ((regs->spcflags & SPCFLAG_INT) && !currprefs.cpu_cycle_exact) {
--- NEW FILE e-uae.spec ---
Name: e-uae
Version: 0.8.29
Release: 0.10.wip4%{?dist}
Summary: A powerful Amiga Emulator, based on UAE
Group: Applications/Emulators
License: GPLv2+
URL: http://www.rcdrummond.net/uae/
Source0: http://www.rcdrummond.net/uae/%{name}-%{version}-WIP4/%{name}-%{version}-...
Source1: %{name}.png
Patch0: %{name}-0.8.29-irqfixes.patch
Patch1: %{name}-0.8.29-hardfilefixes.patch
# patch from upstream not to require an executable stack
Patch2: %{name}-0.8.29-execstack.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel => 2.0.0
BuildRequires: libcapsimage-devel => 2.0.0
BuildRequires: libICE-devel
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
BuildRequires: SDL-devel => 1.2.0
BuildRequires: zlib-devel
Requires: hicolor-icon-theme
Requires: policycoreutils
%description
E-UAE is an Amiga Emulator based on UAE which attempts to bring all the
features of WinUAE to non Windows platforms. E-UAE includes almost
complete emulation of the custom chips, including AGA, bsdsocket
emulation, JIT compilation for X86 processors, emulation of the 68000 to
the 68060 as well as the FPUs.
%prep
%setup -q -n %{name}-%{version}-WIP4
%patch0 -p1
%patch1 -p1
%patch2 -p1
# Encoding fixes
iconv -f iso8859-1 ChangeLog -t utf8 > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog
# Permission fixes
chmod -x src/crc32.c
%build
# Flag notes
# --enable-jit : Defaults to enabled on X86
# --enable-natmem : Defaults to enabled on Linux/X86
# --enable-autoconfig : Defaults to enabled if threading available (should be)
# --enable-aga : Defaults to true
# --enable-cdtv : Defaults to true if SCSI is enabled.
# --enable-cd32 : Defaults to true if AGA and SCSI is enabled
# --enable-action-replay : Defaults to true
# --enable-cycle-exact-cpu : Defaults to true
# --enable-compatible-cpu : Defaults to true
# --enable-natmem : Defaults to yes on Linux
# --enable-autoconfig : Defaults to yes if threads enabled (they should be)
# --enable-fdi : Defaults to on
%configure --enable-bsdsock-new \
--enable-ui \
--enable-audio \
--with-caps \
--with-caps-prefix=/usr \
--with-sdl \
--with-sdl-gfx \
--with-sdl-sound
# Don't use parallel building (%%{?_smp_mflags}) seems broken in some cases
make
# Build desktop icon
cat >%{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=E-UAE
GenericName=Amiga Emulator
Comment=UNIX Amiga Emulator
Exec=uae
Icon=%{name}
Terminal=false
Type=Application
Categories=Game;Emulator;
EOF
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
desktop-file-install --vendor dribble \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
%clean
rm -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
# SELinux support
%ifarch %{ix86}
semanage fcontext -a -t java_exec_t %{_bindir}/uae >/dev/null 2>&1 || :
restorecon -R %{_bindir}/uae
%endif
%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
# SELinux support
%ifarch %{ix86}
if [ "$1" -eq "0" ]; then
semanage fcontext -d -t java_exec_t %{_bindir}/uae >/dev/null 2>&1 || :
fi
%endif
%files
%defattr(-,root,root,-)
%{_bindir}/uae
%{_bindir}/readdisk
%{_datadir}/applications/dribble-e-uae.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%doc docs/* ChangeLog COPYING README
%changelog
* Sun Oct 05 2008 Andrea Musuruane <musuruan(a)gmail.com> 0.8.29-0.10.wip4
- addedd a patch from upstream not to require an executable stack
- added an SELinux context because uae requires an executable heap
* Fri Mar 21 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.9.wip4
- Add support for libcapsimage to x86_64
- Added patch for various IRQ handling fixes
- Added patch for fixing hardfile related race condition
- Convert ChangeLog to UTF8
- License change due to new guidelines
* Sat Mar 31 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.8.wip4
- Upgrade to 0.8.29-WIP4
* Tue Mar 13 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.7.wip3
- Dropped dribble-menus requirement, due to be obsoleted
- Changed .desktop category to Game;Emulator;
* Thu Jan 25 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.6.wip3
- Various spec cleanups
- Dropped support for FC4
- Renamed icon and .desktop file
* Wed Aug 02 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.5.wip3
- Upgraded to 0.8.29-WIP3
* Sun Jul 09 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.4.wip2
- Moved icon installation to make it freedesktop compliant
- Added %%post and %%postun sections to update icon cache at installation
* Sat Jun 24 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.3.wip2
- Cosmetic fixes for the Dribble repository
- Rebuilt ensuring libICE support
- Moved .desktop file creation to build section
* Wed May 31 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.2.wip2
- Corrected release name format to 0.%%{X}.%%{alphatag} from 0.%%{alphatag}.%%{X}
- Added %%{version}-%%{release} to provides field
- Dropped gawk as a buildrequire. Doesn't seem to be needed.
- Dropped xorg-x11-devel as a buildrequire. SDL-devel should pull in needed X
headers and this should make it compatible with both modular/non-modular X
- Added ncurses-devel as a buildrequire
- Added pkgconfig as a buildrequire
- Disabled parallel make as it currently seems to be broken.
- Cosmetic changes to the configure section. Makes it less verbose.
* Sat May 06 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.29-0.WIP2.1.iss
- Upgraded to 0.8.29-WIP2
- Spec file changed to more closely follow Fedora packaging guidelines
- Amiga specific tools removed
- Added gawk, xorg-x11-devel, desktop-file-utils buildrequires
- Removed file from buildrequires as per packaging guidelines
- Added x86_64 support, minus caps stuff as it's not available for x86_64
* Mon Oct 24 2005 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.28-1.iss
- Upgraded to 0.8.28
- Fixes for deprecated fields no longer supported by the latest rpmbuild
- Now compiled against SDL as the FC2 arts/SDL bug appears fixed.
- Compiled on PPC
- SCSI emulation removed.
* Sun Jan 23 2005 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.27-2.iss
- Upgraded to the final version of 0.8.27 instead of RC2
- Now compiled against alsa as it supports it natively.
- Added scsi emulation support.
- CD32 emulation now enabled as it required scsi-emulation support
- CDTV emulation now enabled as it required scsi-emulation support
* Tue Nov 30 2004 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.27-1.iss
- Initial Release
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/e-uae/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 15:33:09 -0000 1.1
+++ .cvsignore 16 Oct 2008 17:43:22 -0000 1.2
@@ -0,0 +1 @@
+e-uae-0.8.29-WIP4.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/e-uae/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 15:33:09 -0000 1.1
+++ sources 16 Oct 2008 17:43:22 -0000 1.2
@@ -0,0 +1 @@
+cbfd7e3d7a1b323331afbb92ea7ff4f0 e-uae-0.8.29-WIP4.tar.bz2
16 years
- 1
- 0