CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'compiz-fglrx' into 'belenos'

Browse source 
Remove recomendation to use non-free software

Based on an almost three years old helper here: http://listas.trisquel.info/pipermail/trisquel-devel/2012-June/000684.html

Closes https://trisquel.info/en/issues/1942

See merge request !99
This commit is contained in:
Ruben Rodriguez 2015-06-18 19:01:49 +00:00
commit a8eb506918
1 changed files with 54 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

54
helpers/make-compiz Normal file
View file

@ -0,0 +1,54 @@
#!/bin/sh
#
# Copyright (C) 2012 Ryan Houlgate <rhoulgate@member.fsf.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
. ./config
# Need to remove an 'option' in the XML file.
# It extends for five lines, so we will comment
# them out.
sed -i '/fglrx_xgl_fix"/,/option/d' plugins/workarounds/workarounds.xml.in
# The C++ code calls methods that appear to be based
# on the part of the XML file that we removed.
# There is a method that returns a boolean to
# indicate whether or not this feature should
# be exhibited. I've created a dummy method
# that always returns false for that.
# It's declared as "extern" in the "*.h" file.
# It's defined at the end of the "*.cpp" file.
# There is another call to a related method.
# I just comment out that call.
sed -i '/optionSetFglrxXglFixNotify/,/_1/ s:^://:' plugins/workarounds/src/workarounds.cpp
# Create declaration of method in the *.h file
echo "extern bool optionGetFglrxXglFix();" >> plugins/workarounds/src/workarounds.h
# Create definition of method in the *.cpp file
echo "// Providing dummy method to always return false due to the removal" >> plugins/workarounds/src/workarounds.cpp
echo "// of non-free software recommendation" >> plugins/workarounds/src/workarounds.cpp
echo "bool optionGetFglrxXglFix() { return false; }" >> plugins/workarounds/src/workarounds.cpp
changelog "Remove recomendation to use fglrx (non-free software)"
compile