archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-03-19 00:21:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/qt5: rpi.patch update

Browse source
This commit is contained in:
Kevin Mihelich 2014-12-12 15:27:09 +00:00
parent 1962ef7d3d
commit 9286eb46b5
2 changed files with 9 additions and 9 deletions

2
extra/qt5/PKGBUILD
View file

@ -60,7 +60,7 @@ md5sums=('21843b00ecde8956217faab391bc007b'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
'df4b63eb078b81a708a7dc0859cdd693'
'9fe115d2c1d4778b8cb8e7f1b2e2bca6'
'd55ad1f1c90725834b44eada5db4e401')
prepare() {

16
extra/qt5/rpi.patch
View file

@ -1,10 +1,10 @@
diff -urN a/qtbase/configure b/qtbase/configure
--- a/qtbase/configure 2014-09-11 04:47:55.000000000 -0600
+++ b/qtbase/configure 2014-09-17 07:19:44.775372102 -0600
@@ -4809,16 +4809,6 @@
--- a/qtbase/configure 2014-12-05 09:24:14.000000000 -0700
+++ b/qtbase/configure 2014-12-12 07:42:49.588901813 -0700
@@ -4853,16 +4853,6 @@
fi
elif [ "$CFG_OPENGL" = "es2" ]; then
#OpenGL ES 2.x
#OpenGL ES 2.0
- if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists glesv2 2>/dev/null; then
- QMAKE_INCDIR_OPENGL_ES2=`$PKG_CONFIG --cflags-only-I glesv2 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'`
- QMAKE_LIBDIR_OPENGL_ES2=`$PKG_CONFIG --libs-only-L glesv2 2>/dev/null | sed -e 's,^-L,,g' -e 's, -L, ,g'`
@ -15,10 +15,10 @@ diff -urN a/qtbase/configure b/qtbase/configure
- QMakeVar set QMAKE_LIBS_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_LIBS_OPENGL_ES2"`"
- fi
-
compileTest unix/opengles2 "OpenGL ES 2.x" $QMAKE_LIBS_OPENGL_ES2 $QMAKE_CFLAGS_OPENGL_ES2
compileTest unix/opengles2 "OpenGL ES 2.0" $QMAKE_LIBS_OPENGL_ES2 $QMAKE_CFLAGS_OPENGL_ES2
if [ $? != "0" ]; then
echo "The OpenGL ES 2.0 functionality test failed!"
@@ -5138,14 +5128,6 @@
@@ -5204,14 +5194,6 @@
exit 101
fi
@ -34,8 +34,8 @@ diff -urN a/qtbase/configure b/qtbase/configure
CFG_EGL=yes
if compileTest qpa/egl-x11 "EGL-X11" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
diff -urN a/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in b/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in
--- a/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in 2014-09-11 04:48:05.000000000 -0600
+++ b/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in 2014-09-17 07:19:44.780372095 -0600
--- a/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in 2014-12-05 09:24:36.000000000 -0700
+++ b/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in 2014-12-12 07:42:49.593901822 -0700
@@ -97,8 +97,8 @@
string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_lib})
if (NOT TARGET Qt5::Gui_${_cmake_lib_name} AND NOT _Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE)