rpms/fglrx-kmod/F-9 fglrx-kmod.spec,1.18,1.19
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32079
Modified Files:
fglrx-kmod.spec
Log Message:
Oops, disable newest so we build for all kernels
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-9/fglrx-kmod.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fglrx-kmod.spec 31 Jan 2009 16:58:44 -0000 1.18
+++ fglrx-kmod.spec 31 Jan 2009 16:59:18 -0000 1.19
@@ -3,7 +3,7 @@
# "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 buildforkernels newest
%define ativersion 9.1
15 years, 2 months
rpms/fglrx-kmod/F-9 .cvsignore, 1.3, 1.4 fglrx-kmod.spec, 1.17, 1.18 sources, 1.4, 1.5
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32044
Modified Files:
.cvsignore fglrx-kmod.spec sources
Log Message:
* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
- Update to Catalyst 9.1
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 16 Dec 2008 17:40:11 -0000 1.3
+++ .cvsignore 31 Jan 2009 16:58:44 -0000 1.4
@@ -1 +1 @@
-fglrx-kmod-data-8.561.tar.bz2
+fglrx-kmod-data-8.573.tar.bz2
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-9/fglrx-kmod.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fglrx-kmod.spec 21 Jan 2009 18:48:42 -0000 1.17
+++ fglrx-kmod.spec 31 Jan 2009 16:58:44 -0000 1.18
@@ -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.12
+%define ativersion 9.1
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -14,14 +14,14 @@
%endif
Name: fglrx-kmod
-Version: 8.561
-Release: 2.%{ativersion}%{?dist}.3
+Version: 8.573
+Release: 1.%{ativersion}%{?dist}
# 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://downloads.diffingo.com/livna/kmod-data/fglrx-kmod-data-%{version}....
+Source0: http://downloads.diffingo.com/rpmfusion/kmod-data/fglrx-kmod-data-%{versi...
Source11: fglrx-kmodtool-excludekernel-filterfile
Patch0: makefile-kver-path.patch
@@ -97,6 +97,9 @@
%changelog
+* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
+- Update to Catalyst 9.1
+
* Wed Jan 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 8.561-2.8.12.3
- rebuild for latest Fedora kernel;
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 16 Dec 2008 18:15:44 -0000 1.4
+++ sources 31 Jan 2009 16:58:44 -0000 1.5
@@ -1 +1 @@
-f26a00b32e3d190cf630eda54d5c3410 fglrx-kmod-data-8.561.tar.bz2
+f2f382ea083696648d1a50c2f4216a08 fglrx-kmod-data-8.573.tar.bz2
15 years, 2 months
rpms/xorg-x11-drv-fglrx/F-9 .cvsignore, 1.3, 1.4 amdcccle.desktop, 1.1, 1.2 fglrx-README.Fedora, 1.2, 1.3 sources, 1.4, 1.5 xorg-x11-drv-fglrx.spec, 1.13, 1.14
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31634
Modified Files:
.cvsignore amdcccle.desktop fglrx-README.Fedora sources
xorg-x11-drv-fglrx.spec
Log Message:
* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
- Update to Catalyst 9.1
- Include README.Fedora in %doc
- Remove fglrx_dri.so symlink hack, move fglrx_dri.so back to -libs
- Update License tag
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 16 Dec 2008 17:43:43 -0000 1.3
+++ .cvsignore 31 Jan 2009 16:56:06 -0000 1.4
@@ -1 +1 @@
-ati-driver-installer-8-12-x86.x86_64.run
+ati-driver-installer-9-1-x86.x86_64.run
Index: amdcccle.desktop
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/amdcccle.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amdcccle.desktop 16 Oct 2008 16:20:01 -0000 1.1
+++ amdcccle.desktop 31 Jan 2009 16:56:06 -0000 1.2
@@ -14,9 +14,8 @@
Comment[es]=Configuración del adaptador de los gráficos de ATI
Comment[fr]=Configuration d'adapteur de graphiques d'ATI
Comment[it]=Configurazione dell'adattatore dei grafici di ATI
-Icon=ccc_large.xpm
+Icon=ccc_large
Exec=amdcccle
Type=Application
Terminal=false
-Encoding=UTF-8
Categories=Qt;System;
Index: fglrx-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/fglrx-README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fglrx-README.Fedora 30 Dec 2008 22:41:05 -0000 1.2
+++ fglrx-README.Fedora 31 Jan 2009 16:56:06 -0000 1.3
@@ -69,3 +69,5 @@
from rpmfusion.org and rebuild the kernel module with the following command:
rpmbuild --rebuild /path/to/fglrx-srpm.src.rpm
+
+
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 16 Dec 2008 17:43:43 -0000 1.4
+++ sources 31 Jan 2009 16:56:06 -0000 1.5
@@ -1 +1 @@
-2a62d8c5173f091379e458371782a580 ati-driver-installer-8-12-x86.x86_64.run
+cc4ff401586a6c099c9fd002c25cf7bb ati-driver-installer-9-1-x86.x86_64.run
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-fglrx.spec 31 Dec 2008 18:46:58 -0000 1.13
+++ xorg-x11-drv-fglrx.spec 31 Jan 2009 16:56:06 -0000 1.14
@@ -1,5 +1,5 @@
%define atilibdir %{_libdir}/fglrx
-%define ativersion 8.12
+%define ativersion 9.1
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -8,13 +8,13 @@
%endif
Name: xorg-x11-drv-fglrx
-Version: 8.561
-Release: 5.%{ativersion}%{?dist}
+Version: 8.573
+Release: 1.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
-License: BSD/Commercial/GPL/QPL
+License: Redistributable, no modification permitted
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...
Source1: fglrx-README.Fedora
Source3: fglrx-config-display
Source4: fglrx-init
@@ -120,8 +120,9 @@
cp -r fglrx/common/* fglrx/x740_64a/* fglrx/arch/x86_64/* fglrxpkg/
%endif
-# fix doc perms
+# fix doc perms & copy README.Fedora
find fglrxpkg/usr/share/doc/fglrx -type f -exec chmod 0644 {} \;
+install -pm 0644 %{SOURCE1} ./README.Fedora
%build
@@ -211,8 +212,7 @@
install -D -p -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/a-lid-aticonfig.conf
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor livna \
- --add-category X-Livna \
+desktop-file-install --vendor rpmfusion \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE5}
@@ -227,12 +227,6 @@
chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.xbm.example
chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.sh
-%ifarch x86_64
-# dri workaround
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/dri
-ln -s ../../lib64/dri/fglrx_dri.so $RPM_BUILD_ROOT%{_prefix}/lib/dri/
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -264,7 +258,7 @@
%files
%defattr(-,root,root,-)
-%doc fglrxpkg/usr/share/doc/fglrx/*
+%doc fglrxpkg/usr/share/doc/fglrx/* README.Fedora
%dir %{_sysconfdir}/ati/
%{_sysconfdir}/ati/authatieventsd.sh
%{_sysconfdir}/ati/signature
@@ -289,10 +283,6 @@
%{_mandir}/man[1-9]/atieventsd.*
%{_libdir}/xorg/modules/extensions/fglrx/
%{_libdir}/xorg/modules/*.so
-%{_libdir}/dri/
-%ifarch x86_64
-%{_prefix}/lib/dri/
-%endif
%files libs
%defattr(-,root,root,-)
@@ -300,6 +290,7 @@
%{atilibdir}/*.so*
# FIXME: This file is recognized as "data" - figure out how to move it later
%{atilibdir}/libAMDXvBA.cap
+%{_libdir}/dri/
%files devel
%defattr(-,root,root,-)
@@ -310,6 +301,12 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
+- Update to Catalyst 9.1
+- Include README.Fedora in %%doc
+- Remove fglrx_dri.so symlink hack, move fglrx_dri.so back to -libs
+- Update License tag
+
* Wed Dec 31 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-5.8.12
- symlink needs to be ../lib64/dri, not ../lib64
15 years, 2 months
rpms/ffmpeg/F-9 ffmpeg-cmov.patch, NONE, 1.1 ffmpeg-r16802.patch, NONE, 1.1 ffmpeg-r16846.patch, NONE, 1.1 ffmpeg.spec, 1.3, 1.4
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18681
Modified Files:
ffmpeg.spec
Added Files:
ffmpeg-cmov.patch ffmpeg-r16802.patch ffmpeg-r16846.patch
Log Message:
* Sat Jan 31 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.49.20080908
- drop unnecessary patch
- change the lib split on x86, it doesn't work right for P3/AthlonXP
- enable bzlib and dirac support via external libs
- sort BR list alphabetically
- fix a couple of exploitable and potentially exploitable vulnerabilities, including
http://www.trapkit.de/advisories/TKADV2009-004.txt
- add obsoletes for -compat package (RPMFusion bug #173)
- reworked build system
- build optimized versions where it makes sense
- specfile cleanups
- enable yasm for optimized asm routines on x86_32
- add obsoletes for Freshrpms' libpostproc subpackage
ffmpeg-cmov.patch:
--- NEW FILE ffmpeg-cmov.patch ---
diff -up ffmpeg-20080908/configure.cmov ffmpeg-20080908/configure
--- ffmpeg-20080908/configure.cmov 2008-11-01 16:23:33.000000000 +0100
+++ ffmpeg-20080908/configure 2008-11-01 16:23:33.000000000 +0100
@@ -1148,6 +1148,8 @@ case "$arch" in
;;
x86_64|amd64)
arch="x86_32"
+ enable cmov
+ enable fast_cmov
enable fast_unaligned
check_cc <<EOF && enable fast_64bit && arch="x86_64"
int test[sizeof(char*) - 7];
ffmpeg-r16802.patch:
--- NEW FILE ffmpeg-r16802.patch ---
diff -up ffmpeg-20080908/libavcodec/indeo3.c.orig ffmpeg-20080908/libavcodec/indeo3.c
--- ffmpeg-20080908/libavcodec/indeo3.c.orig 2008-06-12 23:50:13.000000000 +0200
+++ ffmpeg-20080908/libavcodec/indeo3.c 2009-01-29 21:15:18.000000000 +0100
@@ -348,6 +348,10 @@ static void iv_Decode_Chunk(Indeo3Decode
if(cmd == 0) {
strip++;
+ if(strip >= strip_tbl + FF_ARRAY_ELEMS(strip_tbl)) {
+ av_log(s->avctx, AV_LOG_WARNING, "out of range strip\n");
+ break;
+ }
memcpy(strip, strip-1, sizeof(ustr_t));
strip->split_flag = 1;
strip->split_direction = 0;
@@ -355,6 +359,10 @@ static void iv_Decode_Chunk(Indeo3Decode
continue;
} else if(cmd == 1) {
strip++;
+ if(strip >= strip_tbl + FF_ARRAY_ELEMS(strip_tbl)) {
+ av_log(s->avctx, AV_LOG_WARNING, "out of range strip\n");
+ break;
+ }
memcpy(strip, strip-1, sizeof(ustr_t));
strip->split_flag = 1;
strip->split_direction = 1;
diff -up ffmpeg-20080908/libavutil/common.h.orig ffmpeg-20080908/libavutil/common.h
--- ffmpeg-20080908/libavutil/common.h.orig 2008-08-31 09:39:47.000000000 +0200
+++ ffmpeg-20080908/libavutil/common.h 2009-01-30 01:13:07.000000000 +0100
@@ -116,6 +116,7 @@
#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c)
#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
+#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
/* misc math functions */
extern const uint8_t ff_log2_tab[256];
ffmpeg-r16846.patch:
--- NEW FILE ffmpeg-r16846.patch ---
diff -up ffmpeg-20080908/libavformat/4xm.c.orig ffmpeg-20080908/libavformat/4xm.c
--- ffmpeg-20080908/libavformat/4xm.c.orig 2008-06-03 18:20:54.000000000 +0200
+++ ffmpeg-20080908/libavformat/4xm.c 2009-01-29 21:19:17.000000000 +0100
@@ -163,10 +163,10 @@ static int fourxm_read_header(AVFormatCo
return AVERROR_INVALIDDATA;
}
current_track = AV_RL32(&header[i + 8]);
+ if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack))
+ return -1;
if (current_track + 1 > fourxm->track_count) {
fourxm->track_count = current_track + 1;
- if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack))
- return -1;
fourxm->tracks = av_realloc(fourxm->tracks,
fourxm->track_count * sizeof(AudioTrack));
if (!fourxm->tracks) {
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-9/ffmpeg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ffmpeg.spec 17 Sep 2008 22:57:37 -0000 1.3
+++ ffmpeg.spec 31 Jan 2009 13:14:07 -0000 1.4
@@ -6,31 +6,38 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.4.9
-Release: 0.48.%{svn}%{?dist}
+Release: 0.49.%{svn}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://ffmpeg.org/
Source0: http://rpm.greysector.net/livna/%{name}-%{svn}.tar.bz2
Source1: %{name}-snapshot.sh
+Patch1: %{name}-cmov.patch
Patch4: %{name}-asmreg.patch
+Patch10: %{name}-r16802.patch
+Patch11: %{name}-r16846.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
-BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: faac-devel
+BuildRequires: faad2-devel >= %{faad2min}
+BuildRequires: gsm-devel
+BuildRequires: imlib2-devel
BuildRequires: lame-devel
BuildRequires: libdc1394-devel
-BuildRequires: libvorbis-devel
BuildRequires: libtheora-devel
-BuildRequires: faad2-devel >= %{faad2min}
-BuildRequires: xvidcore-devel
+BuildRequires: libvorbis-devel
+BuildRequires: schroedinger-devel
BuildRequires: SDL-devel
-BuildRequires: gsm-devel
-BuildRequires: imlib2-devel
BuildRequires: texi2html
-BuildRequires: faac-devel
BuildRequires: x264-devel >= 0.0.0-0.14.20080613
-#don't enable until PIC issues on x86_64 are fixed ('ff_imdct_half_sse' in libavcodec/i386/fft_sse.c)
-#BuildRequires: yasm
+BuildRequires: xvidcore-devel
+BuildRequires: zlib-devel
+#don't enable on x86_64 until PIC issues on are fixed (in libavcodec/i386/fft_mmx.asm)
+%ifarch %{ix86}
+BuildRequires: yasm
+%endif
%description
FFMpeg is a complete and free Internet live audio and video
@@ -42,6 +49,8 @@
Summary: Libraries for %{name}
Group: System Environment/Libraries
Requires: faad2-libs >= %{faad2min}
+Obsoletes: ffmpeg-libpostproc < 0.4.9-0.11
+Obsoletes: ffmpeg-compat < 0.4.9-0.49
%description libs
FFMpeg is a complete and free Internet live audio and video
@@ -63,50 +72,128 @@
and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
This package contains development files for %{name}
+%define ff_configure \
+../configure \\\
+ --prefix=%{_prefix} \\\
+ --incdir=%{_includedir}/ffmpeg \\\
+ --libdir=%{_libdir} \\\
+ --mandir=%{_mandir} \\\
+ --arch=%{_target_cpu} \\\
+ --extra-cflags="$RPM_OPT_FLAGS" \\\
+ %{?_with_amr:--enable-libamr-nb --enable-libamr-wb --enable-nonfree} \\\
+ --enable-bzlib \\\
+ --enable-libdc1394 \\\
+ --enable-libfaac \\\
+ --enable-libfaad \\\
+ --enable-libgsm \\\
+ --enable-libmp3lame \\\
+ --enable-libschroedinger \\\
+ --enable-libtheora \\\
+ --enable-libvorbis \\\
+ --enable-libx264 \\\
+ --enable-libxvid \\\
+ --enable-x11grab \\\
+ --enable-avfilter \\\
+ --enable-avfilter-lavf \\\
+ --enable-postproc \\\
+ --enable-swscale \\\
+ --enable-pthreads \\\
+ --disable-static \\\
+ --enable-shared \\\
+ --enable-gpl \\\
+ --disable-debug \\\
+ --disable-optimizations \\\
+ --disable-stripping
+
%prep
%setup -q -n %{name}-%{svn}
+%patch1 -p1 -b .cmov
%patch4 -p1 -b .asmreg
-
+%patch10 -p1
+%patch11 -p1
%build
-./configure \
- --prefix=%{_prefix} \
- --incdir=%{_includedir}/ffmpeg \
- --libdir=%{_libdir} \
+mkdir generic
+pushd generic
+%{ff_configure}\
--shlibdir=%{_libdir} \
- --mandir=%{_mandir} \
- --arch=%{_target_cpu} \
- --extra-cflags="$RPM_OPT_FLAGS -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -fasm -std=c99 -fno-math-errno" \
- %{?_with_amr:--enable-libamr-nb --enable-libamr-wb --enable-nonfree} \
- --enable-libdc1394 \
- --enable-libfaac \
- --enable-libfaad \
- --enable-libgsm \
- --enable-libmp3lame \
- --enable-libtheora \
- --enable-libvorbis \
- --enable-libx264 \
- --enable-libxvid \
- --enable-x11grab \
- --enable-avfilter \
- --enable-avfilter-lavf \
- --enable-postproc \
- --enable-swscale \
- --enable-pthreads \
- --disable-static \
- --enable-shared \
- --enable-gpl \
- --disable-debug \
- --disable-optimizations \
- --disable-stripping
-
-make %{?_smp_mflags}
-
+%ifarch %{ix86}
+ --cpu=%{_target_cpu} \
+%endif
+%ifarch ppc ppc64
+ --disable-altivec \
+%endif
+%ifarch sparc sparc64
+ --disable-vis \
+%endif
+
+make %{?_smp_mflags}
+popd
+
+mkdir simd
+pushd simd
+%ifarch %{ix86}
+%{ff_configure}\
+ --shlibdir=%{_libdir}/i686 \
+ --cpu=i686 \
+ --disable-ffmpeg \
+ --disable-ffserver \
+ --disable-ffplay \
+
+make %{?_smp_mflags}
+%endif
+%ifarch ppc
+%{ff_configure}\
+ --shlibdir=%{_libdir}/altivec \
+ --cpu=g4 \
+ --enable-altivec \
+ --disable-ffmpeg \
+ --disable-ffserver \
+ --disable-ffplay \
+
+make %{?_smp_mflags}
+%endif
+%ifarch ppc64
+%{ff_configure}\
+ --shlibdir=%{_libdir}/altivec \
+ --cpu=g5 \
+ --enable-altivec \
+ --disable-ffmpeg \
+ --disable-ffserver \
+ --disable-ffplay \
+
+make %{?_smp_mflags}
+%endif
+%ifarch sparc sparc64
+%{ff_configure}\
+ --shlibdir=%{_libdir}/v9 \
+ --cpu=v9 \
+ --enable-vis \
+ --disable-ffmpeg \
+ --disable-ffserver \
+ --disable-ffplay \
+
+make %{?_smp_mflags}
+%endif
+popd
%install
rm -rf $RPM_BUILD_ROOT __doc
+pushd generic
make install DESTDIR=$RPM_BUILD_ROOT
+popd
+pushd simd
+%ifarch %{ix86}
+make install DESTDIR=$RPM_BUILD_ROOT
+%endif
+%ifarch ppc ppc64
+make install DESTDIR=$RPM_BUILD_ROOT
+%endif
+%ifarch sparc sparc64
+make install DESTDIR=$RPM_BUILD_ROOT
+%endif
+popd
cp -a doc __doc
rm -f __doc/{Makefile,*.{1,pl,texi}}
@@ -119,7 +206,6 @@
%postun libs -p /sbin/ldconfig
-
%files
%defattr(-,root,root,-)
%doc COPYING.GPL CREDITS Changelog README __doc/*.*
@@ -133,36 +219,52 @@
%files libs
%defattr(-,root,root,-)
-%{_libdir}/libavcodec.so.*
-%{_libdir}/libavdevice.so.*
-%{_libdir}/libavfilter.so.*
-%{_libdir}/libavformat.so.*
-%{_libdir}/libavutil.so.*
-%{_libdir}/libpostproc.so.*
-%{_libdir}/libswscale.so.*
+%{_libdir}/lib*.so.*
%{_libdir}/vhook/
+%ifarch %{ix86}
+%{_libdir}/i686/lib*.so.*
+%{_libdir}/i686/vhook/
+%endif
+%ifarch ppc ppc64
+%{_libdir}/altivec/lib*.so.*
+%{_libdir}/altivec/vhook/
+%endif
+%ifarch sparc sparc64
+%{_libdir}/v9/lib*.so.*
+%{_libdir}/v9/vhook/
+%endif
%files devel
%defattr(-,root,root,-)
-# Note: as of 20070204, --incdir doesn't affect postproc.
%{_includedir}/ffmpeg
-%{_libdir}/libavcodec.so
-%{_libdir}/libavdevice.so
-%{_libdir}/libavfilter.so
-%{_libdir}/libavformat.so
-%{_libdir}/libavutil.so
-%{_libdir}/libpostproc.so
-%{_libdir}/libswscale.so
-%{_libdir}/pkgconfig/libswscale.pc
-%{_libdir}/pkgconfig/libavcodec.pc
-%{_libdir}/pkgconfig/libavdevice.pc
-%{_libdir}/pkgconfig/libavfilter.pc
-%{_libdir}/pkgconfig/libavformat.pc
-%{_libdir}/pkgconfig/libavutil.pc
-%{_libdir}/pkgconfig/libpostproc.pc
+%{_libdir}/pkgconfig/lib*.pc
+%{_libdir}/lib*.so
+%ifarch %{ix86}
+%{_libdir}/i686/lib*.so
+%endif
+%ifarch ppc ppc64
+%{_libdir}/altivec/lib*.so
+%endif
+%ifarch sparc sparc64
+%{_libdir}/v9/lib*.so
+%endif
%changelog
+* Sat Jan 31 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.49.20080908
+- drop unnecessary patch
+- change the lib split on x86, it doesn't work right for P3/AthlonXP
+- enable bzlib and dirac support via external libs
+- sort BR list alphabetically
+- fix a couple of exploitable and potentially exploitable vulnerabilities, including
+ http://www.trapkit.de/advisories/TKADV2009-004.txt
+- add obsoletes for -compat package (RPMFusion bug #173)
+- reworked build system
+- build optimized versions where it makes sense
+- specfile cleanups
+- enable yasm for optimized asm routines on x86_32
+- add obsoletes for Freshrpms' libpostproc subpackage
+
* Thu Sep 18 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.48.20080908
- 20080908 snapshot (r25261), last before ABI change
- fix build --with amr
15 years, 2 months
rpms/mpd/F-10 mpd.spec,1.5,1.6
by Adrian Reber
Author: adrian
Update of /cvs/free/rpms/mpd/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18046
Modified Files:
mpd.spec
Log Message:
* Sat Jan 31 2009 Adrian Reber <adrian(a)lisas.de> - 0.14-4
- added BR libcurl-devel (#326)
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/F-10/mpd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mpd.spec 27 Dec 2008 19:20:55 -0000 1.5
+++ mpd.spec 31 Jan 2009 13:02:07 -0000 1.6
@@ -1,6 +1,6 @@
Name: mpd
Version: 0.14
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
Group: Applications/Multimedia
@@ -31,6 +31,7 @@
BuildRequires: lame-devel
BuildRequires: ffmpeg-devel
BuildRequires: wavpack-devel
+BuildRequires: libcurl-devel
Requires(pre): shadow-utils
Requires(post): chkconfig
Requires(preun): chkconfig /sbin/service
@@ -136,6 +137,9 @@
%ghost %{_localstatedir}/lib/%{name}/mpdstate
%changelog
+* Sat Jan 31 2009 Adrian Reber <adrian(a)lisas.de> - 0.14-4
+- added BR libcurl-devel (#326)
+
* Sat Dec 27 2008 Adrian Reber <adrian(a)lisas.de> - 0.14-3
- updated to 0.14 (#229, #280)
- add mpd user to group pulse-rt (#230)
15 years, 2 months
rpms/mpd/devel mpd.spec,1.6,1.7
by Adrian Reber
Author: adrian
Update of /cvs/free/rpms/mpd/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17580
Modified Files:
mpd.spec
Log Message:
* Sat Jan 31 2009 Adrian Reber <adrian(a)lisas.de> - 0.14-4
- added BR libcurl-devel
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/mpd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mpd.spec 31 Jan 2009 12:57:49 -0000 1.6
+++ mpd.spec 31 Jan 2009 12:58:18 -0000 1.7
@@ -138,7 +138,7 @@
%changelog
* Sat Jan 31 2009 Adrian Reber <adrian(a)lisas.de> - 0.14-4
-- added BR libcurl-devel
+- added BR libcurl-devel (#326)
* Sat Dec 27 2008 Adrian Reber <adrian(a)lisas.de> - 0.14-3
- updated to 0.14 (#229, #280)
15 years, 2 months
rpms/mpd/devel mpd.spec,1.5,1.6
by Adrian Reber
Author: adrian
Update of /cvs/free/rpms/mpd/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17544
Modified Files:
mpd.spec
Log Message:
* Sat Jan 31 2009 Adrian Reber <adrian(a)lisas.de> - 0.14-4
- added BR libcurl-devel
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/mpd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mpd.spec 27 Dec 2008 19:21:59 -0000 1.5
+++ mpd.spec 31 Jan 2009 12:57:49 -0000 1.6
@@ -1,6 +1,6 @@
Name: mpd
Version: 0.14
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
Group: Applications/Multimedia
@@ -31,6 +31,7 @@
BuildRequires: lame-devel
BuildRequires: ffmpeg-devel
BuildRequires: wavpack-devel
+BuildRequires: libcurl-devel
Requires(pre): shadow-utils
Requires(post): chkconfig
Requires(preun): chkconfig /sbin/service
@@ -136,6 +137,9 @@
%ghost %{_localstatedir}/lib/%{name}/mpdstate
%changelog
+* Sat Jan 31 2009 Adrian Reber <adrian(a)lisas.de> - 0.14-4
+- added BR libcurl-devel
+
* Sat Dec 27 2008 Adrian Reber <adrian(a)lisas.de> - 0.14-3
- updated to 0.14 (#229, #280)
- add mpd user to group pulse-rt (#230)
15 years, 2 months
rpms/xorg-x11-drv-fglrx/F-10 .cvsignore, 1.4, 1.5 amdcccle.desktop, 1.1, 1.2 fglrx-README.Fedora, 1.2, 1.3 sources, 1.5, 1.6 xorg-x11-drv-fglrx.spec, 1.15, 1.16
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28917/F-10
Modified Files:
.cvsignore amdcccle.desktop fglrx-README.Fedora sources
xorg-x11-drv-fglrx.spec
Log Message:
* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
- Update to Catalyst 9.1
- Include README.Fedora in %doc
- Remove fglrx_dri.so symlink hack, move fglrx_dri.so back to -libs
- Update License tag
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 16 Dec 2008 17:43:43 -0000 1.4
+++ .cvsignore 31 Jan 2009 06:25:44 -0000 1.5
@@ -1 +1 @@
-ati-driver-installer-8-12-x86.x86_64.run
+ati-driver-installer-9-1-x86.x86_64.run
Index: amdcccle.desktop
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/amdcccle.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amdcccle.desktop 16 Oct 2008 16:20:01 -0000 1.1
+++ amdcccle.desktop 31 Jan 2009 06:25:44 -0000 1.2
@@ -14,9 +14,8 @@
Comment[es]=Configuración del adaptador de los gráficos de ATI
Comment[fr]=Configuration d'adapteur de graphiques d'ATI
Comment[it]=Configurazione dell'adattatore dei grafici di ATI
-Icon=ccc_large.xpm
+Icon=ccc_large
Exec=amdcccle
Type=Application
Terminal=false
-Encoding=UTF-8
Categories=Qt;System;
Index: fglrx-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/fglrx-README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fglrx-README.Fedora 30 Dec 2008 22:41:04 -0000 1.2
+++ fglrx-README.Fedora 31 Jan 2009 06:25:44 -0000 1.3
@@ -73,7 +73,7 @@
5. Release-specific notes
-----------------------------
-This release (Catalyst 8.12) is incompatible with the plymouth graphical boot
+Recent releases (Catalyst 8.12+) are incompatible with the plymouth boot
system implemented in Fedora 10, as the 'radeon' and 'drm' kernel modules are
loaded from the kernel ramdisk image (initrd) before fglrx can be. Because of
this, these modules have been blacklisted. The open-source radeon driver as well
@@ -82,7 +82,15 @@
The initrd image for the current kernel will need to be regenerated before 3D
rendering will function correctly. To do this, execute these commands as root:
- mv /boot/initrd-`uname -r`.img /boot/initrd-`uname -r`.img.bak
- mkinitrd -f --allow-missing /boot/`uname -r`.img
+ mv /boot/initrd-`uname -r`.img /boot/initrd-`uname -r`.img.rfbak
+ mkinitrd -f --allow-missing /boot/initrd-`uname -r`.img `uname -r`
+
+A final reboot will be required before things function as expected. To restore
+plymouth functionality and use the open source drivers, first uninstall the
+xorg-x11-drv-fglrx package from your system and then run:
+ mv /boot/initrd-`uname -r`.img.rfbak /boot/initrd-`uname -r`.img
+
+Once again, a reboot will be required before the open source drivers being
+working properly.
+
-A final reboot will be required before things function as expected.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 16 Dec 2008 17:43:43 -0000 1.5
+++ sources 31 Jan 2009 06:25:44 -0000 1.6
@@ -1 +1 @@
-2a62d8c5173f091379e458371782a580 ati-driver-installer-8-12-x86.x86_64.run
+cc4ff401586a6c099c9fd002c25cf7bb ati-driver-installer-9-1-x86.x86_64.run
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-fglrx.spec 31 Dec 2008 18:46:58 -0000 1.15
+++ xorg-x11-drv-fglrx.spec 31 Jan 2009 06:25:44 -0000 1.16
@@ -1,5 +1,5 @@
%define atilibdir %{_libdir}/fglrx
-%define ativersion 8.12
+%define ativersion 9.1
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -8,13 +8,13 @@
%endif
Name: xorg-x11-drv-fglrx
-Version: 8.561
-Release: 6.%{ativersion}%{?dist}
+Version: 8.573
+Release: 1.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
-License: BSD/Commercial/GPL/QPL
+License: Redistributable, no modification permitted
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...
Source1: fglrx-README.Fedora
Source3: fglrx-config-display
Source4: fglrx-init
@@ -119,12 +119,12 @@
%endif
%ifarch x86_64
-echo `pwd`
cp -r fglrx/common/* fglrx/x740_64a/* fglrx/arch/x86_64/* fglrxpkg/
%endif
-# fix doc perms
+# fix doc perms & copy README.Fedora
find fglrxpkg/usr/share/doc/fglrx -type f -exec chmod 0644 {} \;
+install -pm 0644 %{SOURCE1} ./README.Fedora
%build
@@ -214,8 +214,7 @@
install -D -p -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/a-lid-aticonfig.conf
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor livna \
- --add-category X-Livna \
+desktop-file-install --vendor rpmfusion \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE5}
@@ -238,12 +237,6 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d
install -pm 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/40-fglrx-dri.nodes
-%ifarch x86_64
-# dri workaround
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/dri
-ln -s ../../lib64/dri/fglrx_dri.so $RPM_BUILD_ROOT%{_prefix}/lib/dri/
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -275,7 +268,7 @@
%files
%defattr(-,root,root,-)
-%doc fglrxpkg/usr/share/doc/fglrx/*
+%doc fglrxpkg/usr/share/doc/fglrx/* README.Fedora
%{_sysconfdir}/udev/makedev.d/40-fglrx-dri.nodes
%dir %{_sysconfdir}/ati/
%{_sysconfdir}/ati/authatieventsd.sh
@@ -302,17 +295,13 @@
%{_mandir}/man[1-9]/atieventsd.*
%{_libdir}/xorg/modules/extensions/fglrx/
%{_libdir}/xorg/modules/*.so
-%{_libdir}/dri/
-%ifarch x86_64
-%{_prefix}/lib/dri/
-%endif
%files libs
%defattr(-,root,root,-)
%dir %{atilibdir}
%{atilibdir}/*.so*
-# FIXME: This file is recognized as "data" - figure out how to move it later
%{atilibdir}/libAMDXvBA.cap
+%{_libdir}/dri/
%files devel
%defattr(-,root,root,-)
@@ -323,6 +312,12 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
+- Update to Catalyst 9.1
+- Include README.Fedora in %%doc
+- Remove fglrx_dri.so symlink hack, move fglrx_dri.so back to -libs
+- Update License tag
+
* Wed Dec 31 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-6.8.12
- symlink needs to be ../lib64/dri, not ../lib64
15 years, 2 months
rpms/fglrx-kmod/F-10 .cvsignore, 1.4, 1.5 fglrx-kmod.spec, 1.22, 1.23 sources, 1.5, 1.6
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28876/F-10
Modified Files:
.cvsignore fglrx-kmod.spec sources
Log Message:
* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
- Update to Catalyst 9.1
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 16 Dec 2008 17:40:11 -0000 1.4
+++ .cvsignore 31 Jan 2009 06:25:36 -0000 1.5
@@ -1 +1 @@
-fglrx-kmod-data-8.561.tar.bz2
+fglrx-kmod-data-8.573.tar.bz2
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-10/fglrx-kmod.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fglrx-kmod.spec 24 Jan 2009 07:57:30 -0000 1.22
+++ fglrx-kmod.spec 31 Jan 2009 06:25:36 -0000 1.23
@@ -3,9 +3,9 @@
# "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 buildforkernels newest
-%define ativersion 8.12
+%define ativersion 9.1
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -14,14 +14,14 @@
%endif
Name: fglrx-kmod
-Version: 8.561
-Release: 2.%{ativersion}%{?dist}.3
+Version: 8.573
+Release: 1.%{ativersion}%{?dist}
# 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://downloads.diffingo.com/livna/kmod-data/fglrx-kmod-data-%{version}....
+Source0: http://downloads.diffingo.com/rpmfusion/kmod-data/fglrx-kmod-data-%{versi...
Source11: fglrx-kmodtool-excludekernel-filterfile
Patch0: makefile-kver-path.patch
@@ -97,6 +97,9 @@
%changelog
+* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
+- Update to Catalyst 9.1
+
* Sat Jan 24 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 8.561-2.8.12.3
- rebuild for latest Fedora kernel;
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 16 Dec 2008 18:15:44 -0000 1.5
+++ sources 31 Jan 2009 06:25:36 -0000 1.6
@@ -1 +1 @@
-f26a00b32e3d190cf630eda54d5c3410 fglrx-kmod-data-8.561.tar.bz2
+f2f382ea083696648d1a50c2f4216a08 fglrx-kmod-data-8.573.tar.bz2
15 years, 2 months
rpms/xorg-x11-drv-fglrx/devel blacklist-radeon, NONE, 1.1 udev-fglrx, NONE, 1.1 .cvsignore, 1.5, 1.6 amdcccle.desktop, 1.1, 1.2 fglrx-README.Fedora, 1.1, 1.2 fglrx-config-display, 1.1, 1.2 sources, 1.5, 1.6 xorg-x11-drv-fglrx.spec, 1.10, 1.11
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28917/devel
Modified Files:
.cvsignore amdcccle.desktop fglrx-README.Fedora
fglrx-config-display sources xorg-x11-drv-fglrx.spec
Added Files:
blacklist-radeon udev-fglrx
Log Message:
* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
- Update to Catalyst 9.1
- Include README.Fedora in %doc
- Remove fglrx_dri.so symlink hack, move fglrx_dri.so back to -libs
- Update License tag
--- NEW FILE blacklist-radeon ---
#blacklist required for proprietary fglrx driver
blacklist radeon
blacklist radeonfb
blacklist drm
--- NEW FILE udev-fglrx ---
dri/card0
dri/card1
dri/card2
dri/card3
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 16 Dec 2008 17:43:44 -0000 1.5
+++ .cvsignore 31 Jan 2009 06:25:45 -0000 1.6
@@ -1 +1 @@
-ati-driver-installer-8-12-x86.x86_64.run
+ati-driver-installer-9-1-x86.x86_64.run
Index: amdcccle.desktop
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/amdcccle.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amdcccle.desktop 16 Oct 2008 16:20:01 -0000 1.1
+++ amdcccle.desktop 31 Jan 2009 06:25:45 -0000 1.2
@@ -14,9 +14,8 @@
Comment[es]=Configuración del adaptador de los gráficos de ATI
Comment[fr]=Configuration d'adapteur de graphiques d'ATI
Comment[it]=Configurazione dell'adattatore dei grafici di ATI
-Icon=ccc_large.xpm
+Icon=ccc_large
Exec=amdcccle
Type=Application
Terminal=false
-Encoding=UTF-8
Categories=Qt;System;
Index: fglrx-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/fglrx-README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fglrx-README.Fedora 16 Oct 2008 16:20:01 -0000 1.1
+++ fglrx-README.Fedora 31 Jan 2009 06:25:45 -0000 1.2
@@ -1,7 +1,8 @@
-README for AMD's Linux fglrx drivers, as packaged by livna.org.
+README for AMD's Linux fglrx drivers, as packaged by rpmfusion.org.
+
1. After Installation
----------------------
+-----------------------------
The easiest way to start using the fglrx drivers after installation is to
restart your system.
@@ -44,8 +45,9 @@
fglrx-config-display disable
Note: DRI will be disabled in this case when the fglrx kernel-module was
loaded. It will be enabled again on the next system restart.
-To re-enable the fglrx drivers, run:
- fglrx-config-display enable
+To re-enable the fglrx drivers without a reboot, run:
+ fglrx-config-display enable
+
3. Additional configuration
@@ -54,14 +56,41 @@
For configuration options (TwinView, TV-out etc) see
/usr/share/doc/fglrx-*/index.html
+
4. Kernel Module
-----------------------
+-----------------------------
+
+The fglrx kernel module is required for DRI. For Fedora kernels you will find
+RPMs with the name:
+ kmod-fglrx-$(uname -r)-(ati-version)-fc(releasever).(arch).rpm
+ (e.g. kmod-fglrx-2.6.27.7-134.fc10.x86_64-8.561-1.8.12.fc10.x86_64)
+at rpmfusion.org. If you use another kernel, grab the proper SRPM:
+ (e.g fglrx-kmod-8.561-2.8.12.fc10.src.rpm)
+from rpmfusion.org and rebuild the kernel module with the following command:
+ rpmbuild --rebuild /path/to/fglrx-srpm.src.rpm
+
+
+5. Release-specific notes
+-----------------------------
+
+Recent releases (Catalyst 8.12+) are incompatible with the plymouth boot
+system implemented in Fedora 10, as the 'radeon' and 'drm' kernel modules are
+loaded from the kernel ramdisk image (initrd) before fglrx can be. Because of
+this, these modules have been blacklisted. The open-source radeon driver as well
+as the plymouth graphical boot system will not function while the this driver is
+installed. If you would like to use them, please uninstall this driver first.
+
+The initrd image for the current kernel will need to be regenerated before 3D
+rendering will function correctly. To do this, execute these commands as root:
+ mv /boot/initrd-`uname -r`.img /boot/initrd-`uname -r`.img.rfbak
+ mkinitrd -f --allow-missing /boot/initrd-`uname -r`.img `uname -r`
+
+A final reboot will be required before things function as expected. To restore
+plymouth functionality and use the open source drivers, first uninstall the
+xorg-x11-drv-fglrx package from your system and then run:
+ mv /boot/initrd-`uname -r`.img.rfbak /boot/initrd-`uname -r`.img
+
+Once again, a reboot will be required before the open source drivers being
+working properly.
+
-The fglrx kernel module is required for DRI. For Fedora kernels you will
-find RPMs with the name:
- kmod-fglrx-$(uname -r)-(ati-version)-(livna-release-tag).(arch).rpm
- (e.g. kmod-fglrx-8.34.8-1.2.6.20_1.2933.fc6.i686.rpm)
-at rpm.livna.org. If you use another kernel grab the proper SRPM
- (e.g fglrx-kmod-8.34.8-4.2.6.20_1.2962.fc7.src.rpm)
-from rpm.livna.org and rebuild the kernel module with the following command:
- rpmbuild --rebuild /path/to/fglrxRPM.src.rpm
Index: fglrx-config-display
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/fglrx-config-display,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fglrx-config-display 16 Oct 2008 16:20:01 -0000 1.1
+++ fglrx-config-display 31 Jan 2009 06:25:45 -0000 1.2
@@ -55,9 +55,30 @@
# Backup the file before make any change.
currentDriver = self.getDriver()
# Already enabled?
- if currentDriver == self.majorVendor:
+ if os.path.exists(self.ldconf):
print _('Driver already enabled.')
return
+
+ # Annoying bit because newer fglrx drivers require a Screen section
+ if len(self.xconfig.layout) == 0: # no layouts
+ layout = xf86config.XF86ConfLayout()
+ self.xconfig.layout.insert(layout)
+ layout.identifier = "Default Layout"
+ else:
+ layout = self.xconfig.layout[0]
+ if len(layout.adjacencies) == 0: # no layout adjacencies
+ layout.adjacencies.insert(xf86config.XF86ConfAdjacency())
+ layout.adjacencies[0].screen = "Screen0"
+ if len(self.xconfig.screen) == 0: # no screens
+ screen = xf86config.XF86ConfScreen()
+ self.xconfig.screen.insert(screen)
+ else:
+ screen = self.xconfig.screen[0]
+ screen.device = "Videocard0"
+ screen.defaultdepth = 24
+ screen.identifier = "Screen0"
+ self.xconfig.device[0].identifier = 'Videocard0'
+
# fglrx modules
self.addModulePath("/extensions/fglrx", self.TOP_MOD_DIR)
# 'remembering' magic's in here.
@@ -80,20 +101,13 @@
Utils.writeFile(self.ldconf,"/usr/lib/fglrx\n")
print _('Running ldconfig, this could take some time...')
Utils.runLdconfig()
- # Haven't heard of this in a while either.
- #if not self.checkForModuleAndRemove("radeon") or not self.checkForModuleAndRemove("drm"):
- # print WARNING_DRI_NOT_AVAILABLE
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
- # 20071023: AIGLX now supported by fglrx 8.42.3!
- ## Disable AIGLX by default, it's not compatible
- #self.setComposite(False)
- #self.setAiglxFlag(False)
self.restoreconf()
def disable(self, isAutoConfigure=True):
self.removeModulePath("/extensions/fglrx", self.TOP_MOD_DIR)
# Check if it's already disabled
- if self.getDriver() != self.majorVendor:
+ if not os.path.exists(self.ldconf):
print _('Driver already disabled.')
return
# We have to save the status file so it can be restored later
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 10 Dec 2008 18:28:13 -0000 1.5
+++ sources 31 Jan 2009 06:25:45 -0000 1.6
@@ -1 +1 @@
-2a62d8c5173f091379e458371782a580 ati-driver-installer-8-12-x86.x86_64.run
+cc4ff401586a6c099c9fd002c25cf7bb ati-driver-installer-9-1-x86.x86_64.run
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-fglrx.spec 10 Dec 2008 18:28:13 -0000 1.10
+++ xorg-x11-drv-fglrx.spec 31 Jan 2009 06:25:45 -0000 1.11
@@ -1,5 +1,5 @@
%define atilibdir %{_libdir}/fglrx
-%define ativersion 8.12
+%define ativersion 9.1
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -8,13 +8,13 @@
%endif
Name: xorg-x11-drv-fglrx
-Version: 8.561
+Version: 8.573
Release: 1.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
-License: BSD/Commercial/GPL/QPL
+License: Redistributable, no modification permitted
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...
Source1: fglrx-README.Fedora
Source3: fglrx-config-display
Source4: fglrx-init
@@ -25,6 +25,8 @@
Source9: fglrx-a-lid-aticonfig
Source10: fglrx.sh
Source11: fglrx.csh
+Source12: udev-fglrx
+Source13: blacklist-radeon
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,8 +62,8 @@
Conflicts: kernel-module-ATI-fglrx
Conflicts: ATI-fglrx-IA32-libs
-Obsoletes: ati-x11-drv < %{version}-%{release}
-Provides: ati-x11-drv = %{version}-%{release}
+Obsoletes: ati-x11-drv < %{version}-%{release}
+Provides: ati-x11-drv = %{version}-%{release}
%description
This package provides the most recent proprietary AMD display driver which
@@ -117,12 +119,12 @@
%endif
%ifarch x86_64
-echo `pwd`
cp -r fglrx/common/* fglrx/x740_64a/* fglrx/arch/x86_64/* fglrxpkg/
%endif
-# fix doc perms
+# fix doc perms & copy README.Fedora
find fglrxpkg/usr/share/doc/fglrx -type f -exec chmod 0644 {} \;
+install -pm 0644 %{SOURCE1} ./README.Fedora
%build
@@ -212,8 +214,7 @@
install -D -p -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/a-lid-aticonfig.conf
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor livna \
- --add-category X-Livna \
+desktop-file-install --vendor rpmfusion \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE5}
@@ -228,6 +229,14 @@
chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.xbm.example
chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.sh
+# blacklist to prevent radeon autoloading
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
+install -pm 0644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/blacklist-radeon
+
+# Udev dri nodes for fglrx
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d
+install -pm 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/40-fglrx-dri.nodes
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -259,7 +268,8 @@
%files
%defattr(-,root,root,-)
-%doc fglrxpkg/usr/share/doc/fglrx/*
+%doc fglrxpkg/usr/share/doc/fglrx/* README.Fedora
+%{_sysconfdir}/udev/makedev.d/40-fglrx-dri.nodes
%dir %{_sysconfdir}/ati/
%{_sysconfdir}/ati/authatieventsd.sh
%{_sysconfdir}/ati/signature
@@ -270,7 +280,8 @@
%config %{_sysconfdir}/ati/control
%config %{_sysconfdir}/ati/amdpcsdb.default
%config(noreplace) %{_sysconfdir}/acpi/events/*aticonfig.conf
-%config(noreplace)%{_sysconfdir}/profile.d/fglrx.*
+%config(noreplace) %{_sysconfdir}/profile.d/fglrx.*
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-radeon
%{_initrddir}/*
%{_sbindir}/*
%{_bindir}/*
@@ -289,7 +300,6 @@
%defattr(-,root,root,-)
%dir %{atilibdir}
%{atilibdir}/*.so*
-# FIXME: This file is recognized as "data" - figure out how to move it later
%{atilibdir}/libAMDXvBA.cap
%{_libdir}/dri/
@@ -302,6 +312,13 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
+- Update to Catalst 9.1
+- Sync with changes made for F-10
+- Include README.Fedora in %%doc
+- Remove fglrx_dri.so symlink hack, move fglrx_dri.so back to -libs
+- Update License tag
+
* Wed Dec 10 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-1.8.12
- Update to 8.12
- Add Conflicts: for new nvidia packages
15 years, 2 months