fireglcontrol patches
authorLuca Barbato <lu_zero@gentoo.org>
Wed, 20 Oct 2004 06:49:41 +0000 (06:49 +0000)
committerLuca Barbato <lu_zero@gentoo.org>
Wed, 20 Oct 2004 06:49:41 +0000 (06:49 +0000)
media-video/ati-drivers-extra/ChangeLog
media-video/ati-drivers-extra/Manifest
media-video/ati-drivers-extra/ati-drivers-extra-3.14.1-r1.ebuild [new file with mode: 0644]
media-video/ati-drivers-extra/files/ati-drivers-extra-3.14.1-ui-improvements.patch [new file with mode: 0644]
media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.14.1-r1 [new file with mode: 0644]
media-video/ati-drivers-extra/files/fireglcontrol.desktop [new file with mode: 0644]

index a5451c31a44cb6b1fdf160f78f962e1c25ba5541..3836ab1f60194b51efe04ddd18c4b98cd3259f0f 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/ati-drivers-extra
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers-extra/ChangeLog,v 1.17 2004/10/07 23:02:53 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers-extra/ChangeLog,v 1.18 2004/10/20 06:49:41 lu_zero Exp $
+
+*ati-drivers-extra-3.14.1-r1 (20 Oct 2004)
+
+  20 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-extra-3.14.1-ui-improvements.patch,
+  +files/fireglcontrol.desktop, +ati-drivers-extra-3.14.1-r1.ebuild:
+  Improvements from Ernst Persson <ernstp@gmail.com>, see bug #66368
 
   08 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
   ati-drivers-extra-3.14.1.ebuild:
index 46f7fea0bc2d3f136982e990b513b5bb40133244..1bb327882b3845bb7739bbb0faa3f24288cce563 100644 (file)
@@ -1,7 +1,8 @@
 MD5 1b650ba446c0a79c2b564f1bb0680781 ati-drivers-extra-3.14.1.ebuild 2699
 MD5 036128e0098c209af7334ffa7899c7ca ati-drivers-extra-3.7.6.ebuild 2684
-MD5 9b578b5fc3ec98ed36e5b271e7dd5a1c ChangeLog 2480
+MD5 2b798c1ab7b2c7a15a023f44c7d4cac5 ChangeLog 2769
 MD5 a2a9c4ddd4562efd9ca3b290459e7196 metadata.xml 219
+MD5 51b359c1c619abc135bf594a72f064c7 ati-drivers-extra-3.14.1-r1.ebuild 2770
 MD5 c28c5867bdc7da77868abe2913ced125 ati-drivers-extra-3.2.8-r1.ebuild 2035
 MD5 59e6e70ab8c8098ef07bcb90270c4060 ati-drivers-extra-3.9.0.ebuild 2683
 MD5 d69f4c046750cbb681e13d964131d4db ati-drivers-extra-3.12.0.ebuild 2700
@@ -10,6 +11,9 @@ MD5 4765a7db326f308f862b1fe3e211ef0d files/fglrx-3.7.0-fix-fglrx_panel-includes.
 MD5 54de36d07576ae34efa953192b450dd9 files/digest-ati-drivers-extra-3.11.1 73
 MD5 119541f0c7966bb5474cb42167103ded files/digest-ati-drivers-extra-3.14.1 73
 MD5 aa891a7464224bd9a07fe0e96f40ef7b files/digest-ati-drivers-extra-3.7.6 72
+MD5 41782adae08060611f324e8c8ddf3de9 files/fireglcontrol.desktop 149
+MD5 119541f0c7966bb5474cb42167103ded files/digest-ati-drivers-extra-3.14.1-r1 73
 MD5 918b182a2d40bf073127838d769e1fa5 files/digest-ati-drivers-extra-3.9.0 72
 MD5 0332bde3220fd222a5b8742ba68abefc files/digest-ati-drivers-extra-3.12.0 73
+MD5 38ce0332762da1245665227bfca5b2c4 files/ati-drivers-extra-3.14.1-ui-improvements.patch 3493
 MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-extra-3.2.8-r1 78
diff --git a/media-video/ati-drivers-extra/ati-drivers-extra-3.14.1-r1.ebuild b/media-video/ati-drivers-extra/ati-drivers-extra-3.14.1-r1.ebuild
new file mode 100644 (file)
index 0000000..bdb2d78
--- /dev/null
@@ -0,0 +1,99 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers-extra/ati-drivers-extra-3.14.1-r1.ebuild,v 1.1 2004/10/20 06:49:41 lu_zero Exp $
+
+IUSE="qt"
+
+inherit eutils rpm
+
+DESCRIPTION="Ati precompiled drivers extra application"
+HOMEPAGE="http://www.ati.com"
+SRC_URI="http://www2.ati.com/drivers/linux/fglrx-4.3.0-${PV}.i386.rpm"
+SLOT="${KV}"
+LICENSE="ATI GPL-2 QPL-1.0"
+KEYWORDS="-* ~x86"
+
+DEPEND=">=virtual/linux-sources-2.4
+       app-arch/rpm2targz
+       =media-video/ati-drivers-${PV}*
+       qt? ( >=x11-libs/qt-3.0 )"
+
+RDEPEND="=media-video/ati-drivers-${PV}*
+       qt? ( >=x11-libs/qt-3.0 )"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip"
+
+src_unpack() {
+       local OLDBIN="/usr/X11R6/bin"
+
+       cd ${WORKDIR}
+       rpm_src_unpack
+
+       mkdir -p ${WORKDIR}/extra
+       einfo "Unpacking fglrx_sample_source.tgz..."
+       tar --no-same-owner -C ${WORKDIR}/extra/ -zxf \
+               ${WORKDIR}/usr/src/ATI/fglrx_sample_source.tgz \
+               || die "Failed to unpack fglrx_sample_source.tgz!"
+       # Defining USE_GLU allows this to compile with NVIDIA headers just fine
+       sed -e "s:-I/usr/X11R6/include:-D USE_GLU -I/usr/X11R6/include:" \
+               -i ${WORKDIR}/extra/fgl_glxgears/Makefile.Linux || die
+
+       mkdir -p ${WORKDIR}/extra/fglrx_panel
+       einfo "Unpacking fglrx_panel_sources.tgz..."
+       tar --no-same-owner -C ${WORKDIR}/extra/fglrx_panel/ -zxf \
+               ${WORKDIR}/usr/src/ATI/fglrx_panel_sources.tgz \
+               || die "Failed to unpack fglrx_panel_sources.tgz!"
+       sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
+               -i ${WORKDIR}/extra/fglrx_panel/Makefile
+
+       # Messed up fglrx_panel headers
+       cd ${WORKDIR}/extra/fglrx_panel
+       epatch ${FILESDIR}/fglrx-3.7.0-fix-fglrx_panel-includes.patch
+
+       cd ${WORKDIR}/extra/fglrx_panel
+       epatch ${FILESDIR}/${P}-ui-improvements.patch
+       cp ${FILESDIR}/fireglcontrol.desktop ${WORKDIR}/extra/fglrx_panel
+}
+
+src_compile() {
+       einfo "Building the fgl_glxgears sample..."
+       cd ${WORKDIR}/extra/fgl_glxgears
+       make -f Makefile.Linux || ewarn "fgl_glxgears sample not build!"
+
+       if use qt
+       then
+               einfo "Building the QT fglx panel..."
+               cd ${WORKDIR}/extra/fglrx_panel
+               emake || die
+       fi
+
+       # Removing unused stuff
+       rm -rf ${WORKDIR}/usr/X11R6/bin/{*.bz2,fgl_glxgears}
+}
+
+src_install() {
+       local ATI_ROOT="/usr/lib/opengl/ati"
+
+       # Apps
+       exeinto /opt/ati/bin
+       doexe ${WORKDIR}/extra/fgl_glxgears/fgl_glxgears
+       rm -f ${WORKDIR}/usr/X11R6/bin/*
+
+       if use qt
+       then
+               doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
+
+               # Fix the paths in these
+               insinto /usr/share/pixmaps/
+               doins ${WORKDIR}/extra/fglrx_panel/ati.xpm
+       else
+               # Removing unused stuff
+               rm -rf ${WORKDIR}/usr/share/{applnk,gnome,icons,pixmaps}
+       fi
+
+       # not necessary dodoc ${WORKDIR}/usr/share/doc/fglrx/LICENSE.*
+
+       # Removing unused stuff
+       rm -rf ${WORKDIR}/usr/{src,share/doc}
+}
diff --git a/media-video/ati-drivers-extra/files/ati-drivers-extra-3.14.1-ui-improvements.patch b/media-video/ati-drivers-extra/files/ati-drivers-extra-3.14.1-ui-improvements.patch
new file mode 100644 (file)
index 0000000..c72f8c2
--- /dev/null
@@ -0,0 +1,80 @@
+--- fglrx_panel_sources.orig/main.cpp  2004-06-23 17:35:09.000000000 +0200
++++ fglrx_panel_sources/main.cpp       2004-09-23 12:49:47.000000000 +0200
+@@ -28,8 +28,6 @@
+ //    printf ( "%s\n", lpath.data() ) ;
+ //    printf ( "%s\n", lfile.data() ) ;
+ 
+-    QApplication::setStyle ( new QWindowsStyle ) ;
+-
+     QApplication a( argc, argv );
+ 
+     if ( fi.exists() )
+--- fglrx_panel_sources.orig/Makefile  2004-10-05 01:34:33.743903120 +0200
++++ fglrx_panel_sources/Makefile       2004-10-05 01:35:18.268134408 +0200
+@@ -404,12 +404,8 @@
+       cd /var/tmp/portage/ati-drivers-extra-3.14.1-r1/image//opt/ati/bin/. ; rm -f $(BASENAME) ; ln -s $(TARGET0) $(BASENAME)
+       cp LICENSE.GPL /var/tmp/portage/ati-drivers-extra-3.14.1-r1/image//opt/ati/bin/.
+       cp LICENSE.QPL /var/tmp/portage/ati-drivers-extra-3.14.1-r1/image//opt/ati/bin/.
+-      if  [ $KDEDIR ]; then\
+-        cp fireglcontrol.kdelnk $(KDEDIR)/share/applnk/. ;\
+-        cp ati.xpm $(KDEDIR)/share/icons/. ;\
+-      fi
+-      if test -d /usr/share/gnome/apps; then \
+-        cp fireglcontrol.desktop /usr/share/gnome/apps/. ;\
++      if test -d /usr/share/applications; then \
++        cp fireglcontrol.desktop /usr/share/applications/. ;\
+         if test -d /usr/share/pixmaps; then \
+           cp ati.xpm /usr/share/pixmaps/. ;\
+         fi ;\
+--- fglrx_panel_sources.orig/Makefile  2004-06-23 17:35:04.000000000 +0200
++++ fglrx_panel_sources/Makefile       2004-09-23 12:58:52.377143856 +0200
+@@ -381,7 +381,6 @@
+ depclean:: dep_clean
+ 
+ clean::
+-      @make dep_clean
+       @rm -f *.o *.bak *~ *% #*
+       @rm -f $(TARGET0_CC_META) $(BASENAME) $(TARGET0)
+       @#rm -f $(TARGET0_CC_META) $(BASENAME) $(TARGET0) $(TARGET1) $(TARGET2)
+--- fglrx_panel_sources.orig/AdjustPage.cpp    2004-06-23 17:35:04.000000000 +0200
++++ fglrx_panel_sources/AdjustPage.cpp 2004-09-23 14:39:56.488884576 +0200
+@@ -251,9 +251,9 @@
+   connect ( pUndo, SIGNAL(clicked()), SLOT(OnUndo() ) ) ;
+ #endif // FGL_LATER
+ 
+-  connect ( pSliderRed, SIGNAL(valueChanged(int)), SLOT(OnSliderRed(int) ) ) ;
+-  connect ( pSliderGreen, SIGNAL(valueChanged(int)), SLOT(OnSliderGreen(int) ) ) ;
+-  connect ( pSliderBlue, SIGNAL(valueChanged(int)), SLOT(OnSliderBlue(int) ) ) ;
++  connect ( pSliderRed, SIGNAL(sliderMoved(int)), SLOT(OnSliderRed(int) ) ) ;
++  connect ( pSliderGreen, SIGNAL(sliderMoved(int)), SLOT(OnSliderGreen(int) ) ) ;
++  connect ( pSliderBlue, SIGNAL(sliderMoved(int)), SLOT(OnSliderBlue(int) ) ) ;
+   connect ( pDefaultRed, SIGNAL(clicked()), SLOT(OnDefaultRed() ) ) ;
+   connect ( pDefaultGreen, SIGNAL(clicked()), SLOT(OnDefaultGreen() ) ) ;
+   connect ( pDefaultBlue, SIGNAL(clicked()), SLOT(OnDefaultBlue() ) ) ;
+@@ -628,7 +628,7 @@
+   if ( CurGamma < GAMMA_MIN ) CurGamma = GAMMA_MIN ;
+   if ( CurGamma > GAMMA_MAX ) CurGamma = GAMMA_MAX ;
+   
+-  DeltaGamma = (float)((int)((CurGamma - m_Gamma.red)*100)) / 100 ;
++  DeltaGamma = CurGamma - m_Gamma.red;
+   m_Gamma.red = CurGamma ;
+   if ( pCouple->isChecked() )
+   {
+@@ -662,7 +662,7 @@
+   if ( CurGamma < GAMMA_MIN ) CurGamma = GAMMA_MIN ;
+   if ( CurGamma > GAMMA_MAX ) CurGamma = GAMMA_MAX ;
+   
+-  DeltaGamma = (float)((int)((CurGamma - m_Gamma.green)*100)) / 100 ;
++  DeltaGamma = CurGamma - m_Gamma.green ;
+   m_Gamma.green = CurGamma ;
+   if ( pCouple->isChecked() )
+   {
+@@ -696,7 +696,7 @@
+   if ( CurGamma < GAMMA_MIN ) CurGamma = GAMMA_MIN ;
+   if ( CurGamma > GAMMA_MAX ) CurGamma = GAMMA_MAX ;
+   
+-  DeltaGamma = (float)((int)((CurGamma - m_Gamma.blue)*100)) / 100 ;
++  DeltaGamma = CurGamma - m_Gamma.blue ;
+   m_Gamma.blue = CurGamma ;
+   if ( pCouple->isChecked() )
+   {
diff --git a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.14.1-r1 b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.14.1-r1
new file mode 100644 (file)
index 0000000..2ae2597
--- /dev/null
@@ -0,0 +1 @@
+MD5 ae7bbeab76a3b08e7e2e769dc3ad6a5a fglrx-4.3.0-3.14.1.i386.rpm 4245341
diff --git a/media-video/ati-drivers-extra/files/fireglcontrol.desktop b/media-video/ati-drivers-extra/files/fireglcontrol.desktop
new file mode 100644 (file)
index 0000000..6bb583c
--- /dev/null
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=ATI Control Panel
+Icon=ati.xpm
+Terminal=false
+Type=Application
+Categories=Application;System;
+Exec=fireglcontrol