[svn] r4862 - in trunk: rpms rpms/ati-x11-drv web/freshrpms.net/packages/lists

Tue Oct 31 13:55:20 CET 2006

Author: thias
Date: 2006-10-31 13:55:19 +0100 (Tue, 31 Oct 2006)
New Revision: 4862

Added:
   trunk/rpms/ati-x11-drv/
   trunk/rpms/ati-x11-drv/Makefile.fglrx
   trunk/rpms/ati-x11-drv/ati-x11-drv.spec
   trunk/rpms/ati-x11-drv/fireglcontrolpanel.desktop
Modified:
   trunk/web/freshrpms.net/packages/lists/fc5.txt
   trunk/web/freshrpms.net/packages/lists/fc6.txt
Log:
Initial import of ati-x11-drv and add scummvm to the package lists.


Added: trunk/rpms/ati-x11-drv/Makefile.fglrx
===================================================================

--- trunk/rpms/ati-x11-drv/Makefile.fglrx	                        (rev 0)
+++ trunk/rpms/ati-x11-drv/Makefile.fglrx	2006-10-31 12:55:19 UTC (rev 4862)
@@ -0,0 +1,46 @@
+GCC_VER_MAJ      = $(shell $(CC) --version | head -n 1 | sed -e 's/[^0-9. ]//g;s/^ *//;s/^\(.\)\..*$$/\1/')
+
+obj-m           += fglrx.o
+fglrx-libs      += libfglrx_ip.a.GCC$(GCC_VER_MAJ)
+fglrx-c-objs    += firegl_public.o
+fglrx-objs      += $(fglrx-c-objs) $(fglrx-libs)
+fglrx-hdrs      += firegl_public.h
+drm-hdrs        += drm.h drmP.h drm_os_linux.h drm_proc.h drm_compat.h
+
+EXTRA_CFLAGS    += \
+                -I$(PWD) \
+                -DFGL \
+                -DFGL_LINUX \
+                -DFGL_GART_RESERVED_SLOT \
+                -DFGL_LINUX253P1_VMA_API \
+                -DPAGE_ATTR_FIX=0
+
+ifeq ($(KERNELRELEASE),)
+KERNELRELEASE   = $(shell uname -r)
+endif
+
+KDIR            = /lib/modules/$(KERNELRELEASE)/build
+PWD             = $(shell pwd)
+
+fglrx-cfiles    = ${fglrx-c-objs:.o=.c}
+
+# default:: kmod_build
+
+kmod_build:: $(fglrx-libs) $(fglrx-cfiles) $(fglrx-hdrs) $(drm-hdrs)
+	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+
+#%.c:
+#	@ln -s ../$@
+
+#%.h:
+#	@ln -s ../$@
+
+#%.GCC$(GCC_VER_MAJ):
+#	@ln -s ../$@
+
+# distclean:: clean
+
+clean::
+	rm -rf *.c *.h *.o *.ko *.GCC* .??* Module.symvers
+
+# ### EOF ###

Added: trunk/rpms/ati-x11-drv/ati-x11-drv.spec
===================================================================
--- trunk/rpms/ati-x11-drv/ati-x11-drv.spec	                        (rev 0)
+++ trunk/rpms/ati-x11-drv/ati-x11-drv.spec	2006-10-31 12:55:19 UTC (rev 4862)
@@ -0,0 +1,301 @@
+# $Id$
+# Authority: matthias
+# ExclusiveDist: fc6
+
+%define fglrxlibdir    %{_libdir}/fglrx
+%define fglrxlib32dir  %{_prefix}/lib/fglrx
+%define desktop_vendor  rpmforge
+
+%ifarch i386
+%define atiarch x86
+%endif
+
+%ifarch x86_64
+%define atiarch x86_64
+%define xext _64a
+%endif
+
+Summary: Proprietary ATI hardware accelerated OpenGL display driver
+Name: ati-x11-drv
+Version: 8.29.6
+Release: 3
+License: Proprietary
+Group: User Interface/X Hardware Support
+URL: http://www.ati.com/online/customercareportal/linux.html
+Source0: http://www2.ati.com/drivers/linux/ati-driver-installer-%{version}.run
+Source1: fireglcontrolpanel.desktop
+Source2: Makefile.fglrx
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+# Required for proper dkms operation
+Requires: gcc
+Requires(post): dkms, /sbin/ldconfig
+Requires(preun): dkms, system-config-display
+# Required by the ATI run file
+Buildrequires: tar
+# Required to build the fireglcontrolpanel
+BuildRequires: qt-devel, libXmu-devel, libXxf86vm-devel
+# Required for our build
+BuildRequires: desktop-file-utils
+ExclusiveArch: i386 x86_64
+Provides: dkms-fglrx = %{version}-%{release}
+Provides: dkms-ati = %{version}-%{release}
+Conflicts: xorg-x11-drv-fglrx
+
+%description
+Proprietary ATI GL libraries, Xorg and Linux module for hardware
+accelerated OpenGL support.
+
+INSTALLING THIS PACKAGE WILL TAINT YOUR KERNEL, SO PLEASE DO NOT REPORT *ANY*
+BUGS BEFORE YOU UNINSTALL THE PACKAGE AND REBOOT THE SYSTEM.
+
+
+%package devel
+Summary: Development files for the proprietary ATI display driver
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Development files for the proprietary ATI display driver.
+
+
+%prep
+%setup -T -c
+# Extract the "sources"
+sh %{SOURCE0} --extract .
+# Fix for FC6 kernels
+%{__perl} -pi -e 's|#include <linux/config.h>||g' \
+    common/lib/modules/fglrx/build_mod/*.{c,h}
+
+
+%build
+# Build the fireglcontrolpanel utility, nothing else needs to be built
+%{__mkdir_p} fireglcontrolpanel
+cd fireglcontrolpanel
+tar xzvf ../common/usr/src/ATI/fglrx_panel_sources.tgz
+. /etc/profile.d/qt.sh
+# Get most linking to work again
+%{__perl} -pi -e 's|/usr/X11R6|/usr|g' Makefile
+# Have the linking work with lib64
+%{__perl} -pi -e 's|\$\(MK_QTDIR\)/\$\(LIB_DIR\)|\$\(MK_QTDIR\)/lib|g' Makefile
+# Actual build
+# MK_QTDIR needs to be forced since the default is wrong
+# LIBQT_DYN needs to be forced since it tried to use "qt" on i386
+# DEBUG needs to be set to 1 so that we can pass our oprflags as debug flags
+%{__make} \
+    MK_QTDIR="$QTDIR" \
+    LIBQT_DYN="qt-mt" \
+    DEBUG=1 \
+    CDEBFLAGS="%{optflags}" \
+    CCDEBFLAGS="%{optflags}"
+# Get the program back to its original name, we don't want the symlink
+%{__rm} -f fireglcontrol *.bz2
+%{__mv} fireglcontrol.qt*.gcc* fireglcontrolpanel
+cd ..
+
+
+%install
+%{__rm} -rf %{buildroot} _doc
+
+%define dkms_name fglrx
+%define dkms_vers %{version}-%{release}
+%define quiet -q
+
+# Copy dkms conf file
+%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/dkms.conf << 'EOF'
+PACKAGE_NAME=%{dkms_name}
+PACKAGE_VERSION=%{dkms_vers}
+BUILT_MODULE_NAME[0]=fglrx
+DEST_MODULE_LOCATION[0]=/kernel/drivers/video/aty
+AUTOINSTALL=YES
+EOF
+
+# Install all the kernel module files, without make.sh or 2.6.x/
+%{__cp} -a common/lib/modules/fglrx/build_mod/*.{c,h} \
+    %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+%{__install} -p -m 0644 \
+    arch/%{atiarch}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4 \
+    %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+# Install our own Makefile, based on the one from 2.6.x/
+%{__install} -p -m 0644 %{SOURCE2} \
+    %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/Makefile
+
+# Install utilities and atieventsd program with its init script and man page
+%{__mkdir_p} %{buildroot}%{_bindir}
+%{__install} -p -m 0755 arch/%{atiarch}/usr/X11R6/bin/* \
+    %{buildroot}%{_bindir}/
+%{__mkdir_p} %{buildroot}%{_sbindir}
+%{__install} -D -p -m 0755 arch/%{atiarch}/usr/sbin/atieventsd \
+                           common/usr/sbin/atigetsysteminfo.sh \
+    %{buildroot}%{_sbindir}/
+%{__install} -D -p -m 0755 packages/Fedora/atieventsd.init \
+    %{buildroot}%{_sysconfdir}/rc.d/init.d/atieventsd
+%{__install} -D -p -m 0755 packages/Fedora/authatieventsd.sh \
+    %{buildroot}%{_sysconfdir}/ati/authatieventsd.sh
+%{__install} -D -p -m 0644 common/usr/share/man/man8/atieventsd.8.gz \
+    %{buildroot}%{_mandir}/man8/atieventsd.8.gz
+
+# Install libaries
+%{__mkdir_p} %{buildroot}%{fglrxlibdir}
+%{__install} -p -m 0644 arch/%{atiarch}/usr/X11R6/%{_lib}/*.a \
+    %{buildroot}%{fglrxlibdir}/
+%{__install} -p -m 0755 arch/%{atiarch}/usr/X11R6/%{_lib}/*.so.* \
+    %{buildroot}%{fglrxlibdir}/
+%ifarch x86_64
+%{__mkdir_p} %{buildroot}%{fglrxlib32dir}
+%{__install} -p -m 0755 arch/%{atiarch}/usr/X11R6/lib/*.so.* \
+    %{buildroot}%{fglrxlib32dir}/
+%endif
+
+# Install driver and extensions
+# DRI modules, the absolute "compatibility" path is hardcoded, thus required
+%{__mkdir_p} %{buildroot}%{_libdir}/dri
+%{__mkdir_p} %{buildroot}%{_prefix}/X11R6/%{_lib}/modules/dri
+%{__install} -p -m 0755 arch/%{atiarch}/usr/X11R6/%{_lib}/modules/dri/* \
+        %{buildroot}%{_libdir}/dri/
+for drilib in `cd %{buildroot}%{_libdir}/dri/ && echo *`; do
+    %{__ln_s} %{_libdir}/dri/${drilib} \
+        %{buildroot}%{_prefix}/X11R6/%{_lib}/modules/dri/${drilib}
+done
+# Driver modules
+%{__mkdir_p} %{buildroot}%{_libdir}/xorg/modules/{drivers,linux}
+%{__install} -p -m 0755 x710%{?xext}/usr/X11R6/%{_lib}/modules/drivers/* \
+    %{buildroot}%{_libdir}/xorg/modules/drivers/
+%{__install} -p -m 0755 x710%{?xext}/usr/X11R6/%{_lib}/modules/linux/* \
+    %{buildroot}%{_libdir}/xorg/modules/linux/
+
+# Install ACPI config and scripts
+%{__install} -D -p -m 0644 packages/Fedora/a-ac-aticonfig \
+    %{buildroot}%{_sysconfdir}/acpi/events/ac-aticonfig
+%{__install} -D -p -m 0644 packages/Fedora/a-lid-aticonfig \
+    %{buildroot}%{_sysconfdir}/acpi/events/lid-aticonfig
+%{__install} -D -p -m 0755 packages/Fedora/ati-powermode.sh \
+    %{buildroot}%{_sysconfdir}/acpi/actions/ati-powermode.sh
+
+# Install header files
+%{__mkdir_p} %{buildroot}%{_includedir}/GL
+%{__install} -p -m 0644 common/usr/include/GL/*.h \
+    %{buildroot}%{_includedir}/GL/
+%{__mkdir_p} %{buildroot}%{_includedir}/X11/extensions
+%{__install} -p -m 0644 common/usr/X11R6/include/X11/extensions/fglrx_gamma.h \
+    %{buildroot}%{_includedir}/X11/extensions/
+
+# Install the fireglcontrolpanel utility we built in %build
+%{__install} -p -m 0755 fireglcontrolpanel/fireglcontrolpanel \
+    %{buildroot}%{_bindir}/fireglcontrolpanel
+
+# Install pixmap for the fireglcontrolpanel desktop entry
+%{__mkdir_p} %{buildroot}%{_datadir}/pixmaps/
+%{__install} -p -m 0644 packages/SuSE/fglrx.png \
+    %{buildroot}%{_datadir}/pixmaps/fireglcontrolpanel.png
+
+# Desktop entry for fireglcontrolpanel
+%{__mkdir_p} %{buildroot}%{_datadir}/applications/
+desktop-file-install --vendor %{desktop_vendor} \
+    --dir %{buildroot}/%{_datadir}/applications/ \
+    --add-category System \
+    --add-category Application \
+    --add-category KDE \
+    %{SOURCE1}
+
+# Install ld.so.conf.d file
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/ld.so.conf.d/
+echo %{fglrxlibdir} >    %{buildroot}%{_sysconfdir}/ld.so.conf.d/fglrx.conf
+%ifarch x86_64
+echo %{fglrxlib32dir} >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/fglrx.conf
+%endif
+
+# We want to include all the docs except 'examples' since we already ship the
+# ACPI config files and the init script, and it contains nothing more
+%{__cp} -a common/usr/share/doc/fglrx _doc
+%{__rm} -rf _doc/examples/
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%post
+/sbin/ldconfig
+# Enable atieventsd and configure X for the driver
+/sbin/chkconfig --add atieventsd
+# Does strange stuff, like _adding_ screens and devices... so disable for now
+#/usr/bin/aticonfig --initial &>/dev/null || :
+# Add to DKMS registry
+dkms add -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+# Rebuild and make available for the currenty running kernel
+dkms build -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+dkms install -m %{dkms_name} -v %{dkms_vers} %{?quiet} --force || :
+
+%preun
+# Remove all versions from DKMS registry
+dkms remove -m %{dkms_name} -v %{dkms_vers} %{?quiet} --all || :
+# Last removal, disable the proprietary driver
+if [ $1 -eq 0 ]; then
+    /sbin/chkconfig --del atieventsd
+    # Disable for now, as going back to the previous driver would be best
+    #%{_bindir}/system-config-display --set-driver=vesa || :
+fi
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,0755)
+%doc _doc/*
+# Init script
+%{_sysconfdir}/ati/
+%{_sysconfdir}/rc.d/init.d/atieventsd
+# ACPI stuff
+%{_sysconfdir}/acpi/events/ac-aticonfig
+%{_sysconfdir}/acpi/events/lid-aticonfig
+%{_sysconfdir}/acpi/actions/ati-powermode.sh
+# Kernel and dkms related bits
+%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+# Libraries and X modules
+%config %{_sysconfdir}/ld.so.conf.d/fglrx.conf
+%dir %{fglrxlibdir}/
+%{fglrxlibdir}/*.so.*
+%ifarch x86_64
+%dir %{fglrxlib32dir}/
+%{fglrxlib32dir}/*.so.*
+%endif
+%{_libdir}/dri/*.so
+# Own the entire tree, since with Xorg 7.x no one else does anymore
+%{_prefix}/X11R6/
+%{_libdir}/xorg/modules/drivers/*.so
+%{_libdir}/xorg/modules/linux/*.so
+# Tools and utilities
+%{_bindir}/aticonfig
+%{_bindir}/fgl_glxgears
+%{_bindir}/fglrxinfo
+%{_bindir}/fglrx_xgamma
+%{_sbindir}/atieventsd
+%{_sbindir}/atigetsysteminfo.sh
+%{_mandir}/man8/atieventsd.8.gz
+# The fireglcontrolpanel
+%{_bindir}/fireglcontrolpanel
+%{_datadir}/applications/*fireglcontrolpanel.desktop
+%{_datadir}/pixmaps/fireglcontrolpanel.png
+
+%files devel
+%defattr(-,root,root,0755)
+%{_includedir}/GL/
+%{_includedir}/X11/extensions/*
+%{fglrxlibdir}/*.a
+
+
+%changelog
+* Tue Oct 31 2006 Matthias Saou <http://freshrpms.net/> 8.29.6-3
+- Add /usr/X11R6 dri symlinks, required because of hardcoded paths inside the
+  main libraries (Alexandre Silva Lopes).
+- Add /etc/ati/authatieventsd.sh since it is required by the Fedora init script
+  (Alexandre Silva Lopes).
+
+* Wed Oct 25 2006 Matthias Saou <http://freshrpms.net/> 8.29.6-2
+- Fix kernel module Makefile.
+- Fix dri module location.
+
+* Mon Oct 23 2006 Matthias Saou <http://freshrpms.net/> 8.29.6-1
+- Initial RPM release, mostly reinventing the wheel from from scratch...
+


Property changes on: trunk/rpms/ati-x11-drv/ati-x11-drv.spec
___________________________________________________________________
Name: svn:keywords
   + Id

Added: trunk/rpms/ati-x11-drv/fireglcontrolpanel.desktop
===================================================================
--- trunk/rpms/ati-x11-drv/fireglcontrolpanel.desktop	                        (rev 0)
+++ trunk/rpms/ati-x11-drv/fireglcontrolpanel.desktop	2006-10-31 12:55:19 UTC (rev 4862)
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Name=ATI Control
+Comment=ATI graphics adapter settings
+Name[de]=ATI Control
+Comment[de]=ATI grafics adapter settings
+Name[es]=ATI Control
+Comment[es]=Ajustes de tarjeta grafica ATI
+Name[fr]=ATI Control
+Comment[fr]=Contrôles de carte graphique ATI
+Exec=fireglcontrolpanel
+Icon=fireglcontrolpanel.png
+Type=Application
+Encoding=UTF-8
+Categories=Application;System;GNOME;

Modified: trunk/web/freshrpms.net/packages/lists/fc5.txt
===================================================================
--- trunk/web/freshrpms.net/packages/lists/fc5.txt	2006-10-30 14:46:23 UTC (rev 4861)
+++ trunk/web/freshrpms.net/packages/lists/fc5.txt	2006-10-31 12:55:19 UTC (rev 4862)
@@ -106,6 +106,7 @@
 quake3
 rar O
 rte
+scummvm
 sdlmame
 SheepShaver
 snes9express

Modified: trunk/web/freshrpms.net/packages/lists/fc6.txt
===================================================================
--- trunk/web/freshrpms.net/packages/lists/fc6.txt	2006-10-30 14:46:23 UTC (rev 4861)
+++ trunk/web/freshrpms.net/packages/lists/fc6.txt	2006-10-31 12:55:19 UTC (rev 4862)
@@ -15,6 +15,7 @@
 amrnb
 armagetronad
 armagetronad-moviepack O
+ati-x11-drv
 audacious-crossfade
 audacious-extras
 audacious-itouch
@@ -105,6 +106,7 @@
 quake3
 rar O
 rte
+scummvm
 sdlmame
 SheepShaver
 snes9express

