From: Yann E. MORIN Date: Tue, 8 Oct 2013 22:09:47 +0000 (+0200) Subject: package/rpi-userland: rename patches X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c6ac31a623123ce450afc41d9c0b03f56b8e9176;p=buildroot.git package/rpi-userland: rename patches Rename patches to follow standard naming scheme. Signed-off-by: "Yann E. MORIN" Reviewed-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- diff --git a/package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch b/package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch new file mode 100644 index 0000000000..4ffc2b0bb6 --- /dev/null +++ b/package/rpi-userland/rpi-userland-000-add-pkgconfig-files.patch @@ -0,0 +1,54 @@ +Add .pc files for the OpenGLESv2 and EGL libraries + +Those pkg-config files make it easier for Qt5 to find those libraries +and the appropriate link flags. + +Signed-off-by: Thomas Petazzoni + +Index: b/interface/khronos/egl/egl.pc.in +=================================================================== +--- /dev/null ++++ b/interface/khronos/egl/egl.pc.in +@@ -0,0 +1,11 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include ++ ++Name: egl ++Description: RasberryPi implementation of EGL ++Version: 1.0 ++Libs: -L${libdir} -lEGL -lGLESv2 -lbcm_host ++Cflags: -I${includedir}/ -I${includedir}/interface/vcos/pthreads/ \ ++ -I${includedir}/interface/vmcs_host/linux/ +Index: b/interface/khronos/CMakeLists.txt +=================================================================== +--- a/interface/khronos/CMakeLists.txt ++++ b/interface/khronos/CMakeLists.txt +@@ -73,3 +73,11 @@ + + install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION lib) + install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION lib) ++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/egl/egl.pc.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/egl/egl.pc" @ONLY) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/egl/egl.pc" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") ++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/glxx/glesv2.pc.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/glxx/glesv2.pc" @ONLY) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glxx/glesv2.pc" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") +Index: b/interface/khronos/glxx/glesv2.pc.in +=================================================================== +--- /dev/null ++++ b/interface/khronos/glxx/glesv2.pc.in +@@ -0,0 +1,10 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include ++ ++Name: glesv2 ++Description: RasberryPi implementation of OpenGL ESv2 ++Version: 2.0 ++Libs: -L${libdir} -lGLESv2 ++Cflags: -I${includedir}/ diff --git a/package/rpi-userland/rpi-userland-001-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch b/package/rpi-userland/rpi-userland-001-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch new file mode 100644 index 0000000000..e54d29e03d --- /dev/null +++ b/package/rpi-userland/rpi-userland-001-makefiles-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch @@ -0,0 +1,26 @@ +From fec2560cfcb8d3398e4f1ccc3de7923365873676 Mon Sep 17 00:00:00 2001 +From: Samuel Martin +Date: Sat, 5 Jan 2013 16:04:55 +0100 +Subject: [PATCH] makefiles/cmake/vmcs.cmake: allow to override + VMCS_INSTALL_PREFIX + +Signed-off-by: Samuel Martin +--- + makefiles/cmake/vmcs.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makefiles/cmake/vmcs.cmake b/makefiles/cmake/vmcs.cmake +index 0f8641b..cc70cca 100644 +--- a/makefiles/cmake/vmcs.cmake ++++ b/makefiles/cmake/vmcs.cmake +@@ -9,7 +9,7 @@ INCLUDE(CPack) + # Where shall we install? + if (ANDROID) + SET(VMCS_INSTALL_PREFIX "/vendor/brcm/islands" CACHE PATH "Prefix prepended to install directories" FORCE) +-else() ++elseif(NOT DEFINED VMCS_INSTALL_PREFIX) + SET(VMCS_INSTALL_PREFIX "/opt/vc" CACHE PATH "Prefix prepended to install directories" FORCE) + endif() + +-- +1.8.1 diff --git a/package/rpi-userland/rpi-userland-add-pkgconfig-files.patch b/package/rpi-userland/rpi-userland-add-pkgconfig-files.patch deleted file mode 100644 index 4ffc2b0bb6..0000000000 --- a/package/rpi-userland/rpi-userland-add-pkgconfig-files.patch +++ /dev/null @@ -1,54 +0,0 @@ -Add .pc files for the OpenGLESv2 and EGL libraries - -Those pkg-config files make it easier for Qt5 to find those libraries -and the appropriate link flags. - -Signed-off-by: Thomas Petazzoni - -Index: b/interface/khronos/egl/egl.pc.in -=================================================================== ---- /dev/null -+++ b/interface/khronos/egl/egl.pc.in -@@ -0,0 +1,11 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include -+ -+Name: egl -+Description: RasberryPi implementation of EGL -+Version: 1.0 -+Libs: -L${libdir} -lEGL -lGLESv2 -lbcm_host -+Cflags: -I${includedir}/ -I${includedir}/interface/vcos/pthreads/ \ -+ -I${includedir}/interface/vmcs_host/linux/ -Index: b/interface/khronos/CMakeLists.txt -=================================================================== ---- a/interface/khronos/CMakeLists.txt -+++ b/interface/khronos/CMakeLists.txt -@@ -73,3 +73,11 @@ - - install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION lib) - install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION lib) -+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/egl/egl.pc.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/egl/egl.pc" @ONLY) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/egl/egl.pc" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") -+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/glxx/glesv2.pc.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/glxx/glesv2.pc" @ONLY) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glxx/glesv2.pc" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") -Index: b/interface/khronos/glxx/glesv2.pc.in -=================================================================== ---- /dev/null -+++ b/interface/khronos/glxx/glesv2.pc.in -@@ -0,0 +1,10 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include -+ -+Name: glesv2 -+Description: RasberryPi implementation of OpenGL ESv2 -+Version: 2.0 -+Libs: -L${libdir} -lGLESv2 -+Cflags: -I${includedir}/ diff --git a/package/rpi-userland/rpi-userland-makefiles-0001-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch b/package/rpi-userland/rpi-userland-makefiles-0001-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch deleted file mode 100644 index e54d29e03d..0000000000 --- a/package/rpi-userland/rpi-userland-makefiles-0001-cmake-vmcs.cmake-allow-to-override-VMCS_IN.patch +++ /dev/null @@ -1,26 +0,0 @@ -From fec2560cfcb8d3398e4f1ccc3de7923365873676 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sat, 5 Jan 2013 16:04:55 +0100 -Subject: [PATCH] makefiles/cmake/vmcs.cmake: allow to override - VMCS_INSTALL_PREFIX - -Signed-off-by: Samuel Martin ---- - makefiles/cmake/vmcs.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/makefiles/cmake/vmcs.cmake b/makefiles/cmake/vmcs.cmake -index 0f8641b..cc70cca 100644 ---- a/makefiles/cmake/vmcs.cmake -+++ b/makefiles/cmake/vmcs.cmake -@@ -9,7 +9,7 @@ INCLUDE(CPack) - # Where shall we install? - if (ANDROID) - SET(VMCS_INSTALL_PREFIX "/vendor/brcm/islands" CACHE PATH "Prefix prepended to install directories" FORCE) --else() -+elseif(NOT DEFINED VMCS_INSTALL_PREFIX) - SET(VMCS_INSTALL_PREFIX "/opt/vc" CACHE PATH "Prefix prepended to install directories" FORCE) - endif() - --- -1.8.1