Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,102 @@
|
||||
From 853d7486a98e38eb78d48b2dcb1dda36610575b4 Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Sat, 24 Jan 2015 19:44:14 +0100
|
||||
Subject: [PATCH] Add .pc files for the OpenGLESv2, EGL and bcm_host
|
||||
libraries
|
||||
|
||||
Those pkg-config files make it easier for Qt5 to find those libraries
|
||||
and the appropriate link flags.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
---
|
||||
host_applications/linux/libs/bcm_host/CMakeLists.txt | 4 ++++
|
||||
host_applications/linux/libs/bcm_host/bcm_host.pc.in | 10 ++++++++++
|
||||
interface/khronos/CMakeLists.txt | 8 ++++++++
|
||||
interface/khronos/egl/egl.pc.in | 11 +++++++++++
|
||||
interface/khronos/glxx/glesv2.pc.in | 10 ++++++++++
|
||||
5 files changed, 43 insertions(+)
|
||||
create mode 100644 host_applications/linux/libs/bcm_host/bcm_host.pc.in
|
||||
create mode 100644 interface/khronos/egl/egl.pc.in
|
||||
create mode 100644 interface/khronos/glxx/glesv2.pc.in
|
||||
|
||||
diff --git a/host_applications/linux/libs/bcm_host/CMakeLists.txt b/host_applications/linux/libs/bcm_host/CMakeLists.txt
|
||||
index 1edf50a..1f29ead 100644
|
||||
--- a/host_applications/linux/libs/bcm_host/CMakeLists.txt
|
||||
+++ b/host_applications/linux/libs/bcm_host/CMakeLists.txt
|
||||
@@ -20,3 +20,7 @@ target_link_libraries(bcm_host vcos vchostif)
|
||||
|
||||
install(TARGETS bcm_host DESTINATION lib)
|
||||
|
||||
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bcm_host.pc.in"
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/bcm_host.pc" @ONLY)
|
||||
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/bcm_host.pc"
|
||||
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
|
||||
diff --git a/host_applications/linux/libs/bcm_host/bcm_host.pc.in b/host_applications/linux/libs/bcm_host/bcm_host.pc.in
|
||||
new file mode 100644
|
||||
index 0000000..d40d350
|
||||
--- /dev/null
|
||||
+++ b/host_applications/linux/libs/bcm_host/bcm_host.pc.in
|
||||
@@ -0,0 +1,10 @@
|
||||
+prefix=/usr
|
||||
+exec_prefix=${prefix}
|
||||
+libdir=${exec_prefix}/lib
|
||||
+includedir=${prefix}/include
|
||||
+
|
||||
+Name: bcm_host
|
||||
+Description: Broadcom VideoCore host API library
|
||||
+Version: 1
|
||||
+Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm
|
||||
+Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM
|
||||
diff --git a/interface/khronos/CMakeLists.txt b/interface/khronos/CMakeLists.txt
|
||||
index c437291..ec5a605 100644
|
||||
--- a/interface/khronos/CMakeLists.txt
|
||||
+++ b/interface/khronos/CMakeLists.txt
|
||||
@@ -74,3 +74,11 @@ target_link_libraries(OpenVG EGL)
|
||||
|
||||
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")
|
||||
diff --git a/interface/khronos/egl/egl.pc.in b/interface/khronos/egl/egl.pc.in
|
||||
new file mode 100644
|
||||
index 0000000..5868706
|
||||
--- /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: 10
|
||||
+Libs: -L${libdir} -lEGL -lGLESv2 -lbcm_host -lvchostif
|
||||
+Cflags: -I${includedir}/ -I${includedir}/interface/vcos/pthreads/ \
|
||||
+ -I${includedir}/interface/vmcs_host/linux/
|
||||
diff --git a/interface/khronos/glxx/glesv2.pc.in b/interface/khronos/glxx/glesv2.pc.in
|
||||
new file mode 100644
|
||||
index 0000000..2f58eed
|
||||
--- /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}/
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
From 8894136ff80a8c6eeadf1799af59aa3aa7b87827 Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Martin <s.martin49@gmail.com>
|
||||
Date: Sat, 24 Jan 2015 19:44:50 +0100
|
||||
Subject: [PATCH] makefiles/cmake/vmcs.cmake: allow to override
|
||||
VMCS_INSTALL_PREFIX
|
||||
|
||||
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
||||
---
|
||||
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.9.1
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From e0df1a4f1d9737935165f420d0d0f685efc63f49 Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Sat, 24 Jan 2015 22:07:19 +0100
|
||||
Subject: [PATCH] interface: remove faulty assert() to make weston happy at
|
||||
runtime
|
||||
|
||||
This was removed after a discussion on IRC with the weston guys
|
||||
('daniels' on irc.freenode.net/#wayland).
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
---
|
||||
Upstream status: no, will be pushed by weston guys later.
|
||||
If not, I'll do it.
|
||||
---
|
||||
interface/vmcs_host/vc_vchi_dispmanx.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/interface/vmcs_host/vc_vchi_dispmanx.c b/interface/vmcs_host/vc_vchi_dispmanx.c
|
||||
index 85b373c..59a01f8 100755
|
||||
--- a/interface/vmcs_host/vc_vchi_dispmanx.c
|
||||
+++ b/interface/vmcs_host/vc_vchi_dispmanx.c
|
||||
@@ -1296,7 +1296,6 @@ static void *dispmanx_notify_func( void *arg ) {
|
||||
// Decrement the use count - the corresponding "use" is in vc_dispmanx_update_submit.
|
||||
vchi_service_release(dispmanx_client.notify_handle[0]);
|
||||
if (dispmanx_client.update_callback ) {
|
||||
- vcos_assert( dispmanx_client.pending_update_handle == handle);
|
||||
dispmanx_client.update_callback(handle, dispmanx_client.update_callback_param);
|
||||
}
|
||||
} else {
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -0,0 +1,138 @@
|
||||
Disable Werror everywhere
|
||||
|
||||
With gcc-5.1, some constructs that were previously accepted (but wrong)
|
||||
are now considered warnings, and thus -Werror makes them errors.
|
||||
|
||||
Ditch -Werror altoghether.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
diff -durN rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/host_applications/android/apps/vidtex/CMakeLists.txt rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/host_applications/android/apps/vidtex/CMakeLists.txt
|
||||
--- rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/host_applications/android/apps/vidtex/CMakeLists.txt 2015-05-30 15:53:53.000000000 +0200
|
||||
+++ rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/host_applications/android/apps/vidtex/CMakeLists.txt 2015-07-12 16:53:29.528491231 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
cmake_minimum_required(VERSION 2.8)
|
||||
|
||||
-SET(COMPILE_DEFINITIONS -Werror -Wall)
|
||||
+SET(COMPILE_DEFINITIONS -Wall)
|
||||
include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include)
|
||||
|
||||
set (VIDTEX_SOURCES
|
||||
diff -durN rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/host_applications/linux/apps/gencmd/CMakeLists.txt rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/host_applications/linux/apps/gencmd/CMakeLists.txt
|
||||
--- rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/host_applications/linux/apps/gencmd/CMakeLists.txt 2015-05-30 15:53:53.000000000 +0200
|
||||
+++ rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/host_applications/linux/apps/gencmd/CMakeLists.txt 2015-07-12 16:53:29.512491038 +0200
|
||||
@@ -4,7 +4,7 @@
|
||||
set(VCOS_PLATFORM win32)
|
||||
else ()
|
||||
set(VCOS_PLATFORM pthreads)
|
||||
- add_definitions(-Wall -Werror)
|
||||
+ add_definitions(-Wall )
|
||||
endif ()
|
||||
|
||||
include_directories( ../../../..
|
||||
diff -durN rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/host_applications/linux/apps/raspicam/CMakeLists.txt rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/host_applications/linux/apps/raspicam/CMakeLists.txt
|
||||
--- rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/host_applications/linux/apps/raspicam/CMakeLists.txt 2015-05-30 15:53:53.000000000 +0200
|
||||
+++ rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/host_applications/linux/apps/raspicam/CMakeLists.txt 2015-07-12 16:50:54.422624640 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
# raspistill/raspivid/raspiyuv
|
||||
|
||||
-SET(COMPILE_DEFINITIONS -Werror)
|
||||
+SET(COMPILE_DEFINITIONS )
|
||||
|
||||
include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include)
|
||||
include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/apps/raspicam/)
|
||||
diff -durN rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/host_applications/linux/apps/smem/CMakeLists.txt rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/host_applications/linux/apps/smem/CMakeLists.txt
|
||||
--- rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/host_applications/linux/apps/smem/CMakeLists.txt 2015-05-30 15:53:53.000000000 +0200
|
||||
+++ rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/host_applications/linux/apps/smem/CMakeLists.txt 2015-07-12 16:53:29.516491086 +0200
|
||||
@@ -4,7 +4,7 @@
|
||||
include (${VIDEOCORE_ROOT}/makefiles/cmake/global_settings.cmake)
|
||||
|
||||
if (NOT WIN32)
|
||||
- add_definitions(-Wall -Werror)
|
||||
+ add_definitions(-Wall )
|
||||
endif ()
|
||||
|
||||
include_directories (
|
||||
diff -durN rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/host_applications/linux/libs/bcm_host/CMakeLists.txt rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/host_applications/linux/libs/bcm_host/CMakeLists.txt
|
||||
--- rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/host_applications/linux/libs/bcm_host/CMakeLists.txt 2015-07-12 16:48:03.768570937 +0200
|
||||
+++ rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/host_applications/linux/libs/bcm_host/CMakeLists.txt 2015-07-12 16:53:29.520491135 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
set(VCOS_PLATFORM win32)
|
||||
else ()
|
||||
set(VCOS_PLATFORM pthreads)
|
||||
- add_definitions(-Wall -Werror)
|
||||
+ add_definitions(-Wall )
|
||||
endif ()
|
||||
|
||||
include_directories( ../../../..
|
||||
diff -durN rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/host_applications/linux/libs/sm/CMakeLists.txt rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/host_applications/linux/libs/sm/CMakeLists.txt
|
||||
--- rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/host_applications/linux/libs/sm/CMakeLists.txt 2015-05-30 15:53:53.000000000 +0200
|
||||
+++ rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/host_applications/linux/libs/sm/CMakeLists.txt 2015-07-12 16:53:29.524491183 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
set(VCOS_PLATFORM win32)
|
||||
else ()
|
||||
set(VCOS_PLATFORM pthreads)
|
||||
- add_definitions(-Wall -Werror)
|
||||
+ add_definitions(-Wall )
|
||||
endif ()
|
||||
|
||||
include_directories( ../../../..
|
||||
diff -durN rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/interface/mmal/CMakeLists.txt rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/interface/mmal/CMakeLists.txt
|
||||
--- rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/interface/mmal/CMakeLists.txt 2015-05-30 15:53:53.000000000 +0200
|
||||
+++ rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/interface/mmal/CMakeLists.txt 2015-07-12 16:53:29.536491327 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
set(LIBRARY_TYPE SHARED)
|
||||
endif (NOT DEFINED LIBRARY_TYPE)
|
||||
|
||||
-add_definitions(-Wall -Werror)
|
||||
+add_definitions(-Wall )
|
||||
|
||||
add_library(mmal SHARED util/mmal_util.c)
|
||||
|
||||
diff -durN rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/interface/vcos/CMakeLists.txt rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/interface/vcos/CMakeLists.txt
|
||||
--- rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/interface/vcos/CMakeLists.txt 2015-05-30 15:53:53.000000000 +0200
|
||||
+++ rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/interface/vcos/CMakeLists.txt 2015-07-12 16:53:29.540491375 +0200
|
||||
@@ -43,7 +43,7 @@
|
||||
endforeach ()
|
||||
|
||||
if (CMAKE_COMPILER_IS_GNUCC)
|
||||
- add_definitions (-ggdb -Werror -Wall)
|
||||
+ add_definitions (-ggdb -Wall)
|
||||
endif ()
|
||||
|
||||
if (CMAKE_COMPILER_2005)
|
||||
diff -durN rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/interface/vcos/pthreads/CMakeLists.txt rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/interface/vcos/pthreads/CMakeLists.txt
|
||||
--- rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/interface/vcos/pthreads/CMakeLists.txt 2015-05-30 15:53:53.000000000 +0200
|
||||
+++ rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/interface/vcos/pthreads/CMakeLists.txt 2015-07-12 16:53:29.540491375 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
# MSVC5 does not fully support C99, enabling declaration-after-statement
|
||||
# warnings allows a common MSVC5 build error to be detected in Linux builds.
|
||||
if (CMAKE_COMPILER_IS_GNUCC)
|
||||
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wdeclaration-after-statement")
|
||||
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wdeclaration-after-statement")
|
||||
add_definitions (-D_GNU_SOURCE)
|
||||
endif ()
|
||||
|
||||
diff -durN rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/interface/vmcs_host/CMakeLists.txt rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/interface/vmcs_host/CMakeLists.txt
|
||||
--- rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/interface/vmcs_host/CMakeLists.txt 2015-05-30 15:53:53.000000000 +0200
|
||||
+++ rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/interface/vmcs_host/CMakeLists.txt 2015-07-12 16:53:29.528491231 +0200
|
||||
@@ -2,7 +2,7 @@
|
||||
# interface/vmcs_host
|
||||
|
||||
# not working in release build
|
||||
-# add_definitions(-Werror)
|
||||
+# add_definitions()
|
||||
|
||||
# vc_vchi_gencmd.c has a type-punning problem in vc_gencmd_read_response
|
||||
add_definitions(-fno-strict-aliasing)
|
||||
diff -durN rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/interface/vmcs_host/linux/vcfiled/CMakeLists.txt rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/interface/vmcs_host/linux/vcfiled/CMakeLists.txt
|
||||
--- rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990.orig/interface/vmcs_host/linux/vcfiled/CMakeLists.txt 2015-05-30 15:53:53.000000000 +0200
|
||||
+++ rpi-userland-b834074d0c0d9d7e64c133ab14ed691999cee990/interface/vmcs_host/linux/vcfiled/CMakeLists.txt 2015-07-12 16:53:29.532491279 +0200
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
-add_definitions(-Werror)
|
||||
+add_definitions()
|
||||
|
||||
# vcfiled - serves files to videocore. used for media handlers from
|
||||
# OpenMAX/IL and loading VLLs.
|
||||
@@ -0,0 +1,30 @@
|
||||
From 249f6c8b44581083dfb16ebf66bfe94f7c9fb163 Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Fri, 24 Jul 2015 20:20:33 +0200
|
||||
Subject: [PATCH] host-applications: disable missing applications
|
||||
|
||||
Those applications are missing from the public rpi-firmware package, so
|
||||
do not even try to build them.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
---
|
||||
host_applications/linux/CMakeLists.txt | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/host_applications/linux/CMakeLists.txt b/host_applications/linux/CMakeLists.txt
|
||||
index ea4e016..4a87862 100644
|
||||
--- a/host_applications/linux/CMakeLists.txt
|
||||
+++ b/host_applications/linux/CMakeLists.txt
|
||||
@@ -10,9 +10,7 @@ add_subdirectory(apps/smem)
|
||||
add_subdirectory(libs/debug_sym)
|
||||
|
||||
if(ALL_APPS)
|
||||
- add_subdirectory(apps/vcdbg)
|
||||
# add_subdirectory(apps/smct)
|
||||
- add_subdirectory(apps/edid_parser)
|
||||
add_subdirectory(apps/hello_pi)
|
||||
endif()
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
Fix conflicting type qualifiers errors when building with musl.
|
||||
|
||||
Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
---
|
||||
host_applications/linux/apps/raspicam/RaspiVidYUV.c | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/host_applications/linux/apps/raspicam/RaspiVidYUV.c b/host_applications/linux/apps/raspicam/RaspiVidYUV.c
|
||||
index b340d63c913f..13e6a6ccf5bf 100644
|
||||
--- a/host_applications/linux/apps/raspicam/RaspiVidYUV.c
|
||||
+++ b/host_applications/linux/apps/raspicam/RaspiVidYUV.c
|
||||
@@ -106,8 +106,6 @@ const int ABORT_INTERVAL = 100; // ms
|
||||
/// Run/record forever
|
||||
#define WAIT_METHOD_FOREVER 4
|
||||
|
||||
-extern FILE *stderr, *stdout;
|
||||
-
|
||||
int mmal_status_to_int(MMAL_STATUS_T status);
|
||||
static void signal_handler(int signal_number);
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
51
deprecated/firmware/buildroot/package/rpi-userland/Config.in
Normal file
51
deprecated/firmware/buildroot/package/rpi-userland/Config.in
Normal file
@@ -0,0 +1,51 @@
|
||||
config BR2_PACKAGE_RPI_USERLAND
|
||||
bool "rpi-userland"
|
||||
depends on BR2_arm
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS
|
||||
select BR2_PACKAGE_HAS_LIBEGL
|
||||
select BR2_PACKAGE_HAS_LIBGLES
|
||||
select BR2_PACKAGE_HAS_LIBOPENVG
|
||||
select BR2_PACKAGE_HAS_LIBOPENMAX
|
||||
help
|
||||
Raspberry Pi Userland contains the necessary library to use the
|
||||
VideoCore driver.
|
||||
|
||||
Includes source for the ARM side code to interface to:
|
||||
EGL, mmal, GLESv2, vcos, openmaxil, vchiq_arm, bcm_host, WFC, OpenVG.
|
||||
|
||||
https://github.com/raspberrypi/userland/
|
||||
|
||||
if BR2_PACKAGE_RPI_USERLAND
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_LIBEGL
|
||||
default "rpi-userland"
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_LIBGLES
|
||||
default "rpi-userland"
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_LIBOPENVG
|
||||
default "rpi-userland"
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_LIBOPENMAX
|
||||
default "rpi-userland"
|
||||
|
||||
config BR2_PACKAGE_RPI_USERLAND_START_VCFILED
|
||||
bool "Start vcfiled"
|
||||
depends on BR2_INIT_SYSV || BR2_INIT_BUSYBOX
|
||||
help
|
||||
vcfiled is a daemon serving files to VideoCore from the host file
|
||||
system.
|
||||
|
||||
config BR2_PACKAGE_RPI_USERLAND_HELLO
|
||||
bool "hello_pi examples"
|
||||
help
|
||||
Install the hello-pi examples to test the HW (GPU, camera...)
|
||||
|
||||
endif
|
||||
|
||||
comment "rpi-userland needs a toolchain w/ C++, threads, dynamic library"
|
||||
depends on BR2_arm
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
BR2_STATIC_LIBS
|
||||
47
deprecated/firmware/buildroot/package/rpi-userland/S94vcfiled
Executable file
47
deprecated/firmware/buildroot/package/rpi-userland/S94vcfiled
Executable file
@@ -0,0 +1,47 @@
|
||||
#!/bin/sh
|
||||
|
||||
NAME=vcfiled
|
||||
DESC="VideoCore file server daemon $NAME"
|
||||
DAEMON="/usr/sbin/$NAME"
|
||||
DAEMON_ARGS=""
|
||||
CFGFILE="/etc/default/$NAME"
|
||||
PIDFILE="/var/run/$NAME.pid"
|
||||
|
||||
# Read configuration variable file if it is present
|
||||
[ -r "$CFGFILE" ] && . "$CFGFILE"
|
||||
|
||||
start()
|
||||
{
|
||||
printf "Starting $DESC: "
|
||||
start-stop-daemon -S -q -p "$PIDFILE" -x "$DAEMON" -- $DAEMON_ARGS &&
|
||||
echo "done" || echo "failed"
|
||||
}
|
||||
|
||||
stop()
|
||||
{
|
||||
printf "Stopping $DESC: "
|
||||
if start-stop-daemon -K -q -R TERM/30/KILL/5 -p "$PIDFILE" -n "$NAME"; then
|
||||
# This daemon does not remove its PID file when it exits.
|
||||
rm -f "$PIDFILE"
|
||||
echo "done"
|
||||
else
|
||||
echo "failed"
|
||||
fi
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
restart|reload)
|
||||
stop
|
||||
start
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart|reload}" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
@@ -0,0 +1,63 @@
|
||||
################################################################################
|
||||
#
|
||||
# rpi-userland
|
||||
#
|
||||
################################################################################
|
||||
|
||||
RPI_USERLAND_VERSION = 8306b7c757f4b8e8d9148789eeb64c666d9244a5
|
||||
RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
|
||||
RPI_USERLAND_LICENSE = BSD-3c
|
||||
RPI_USERLAND_LICENSE_FILES = LICENCE
|
||||
RPI_USERLAND_INSTALL_STAGING = YES
|
||||
RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_C_FLAGS="-DVCFILED_LOCKFILE=\\\"/var/run/vcfiled.pid\\\""
|
||||
|
||||
RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
|
||||
|
||||
ifeq ($(BR2_PACKAGE_RPI_USERLAND_START_VCFILED),y)
|
||||
define RPI_USERLAND_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -m 0755 -D package/rpi-userland/S94vcfiled \
|
||||
$(TARGET_DIR)/etc/init.d/S94vcfiled
|
||||
endef
|
||||
define RPI_USERLAND_INSTALL_INIT_SYSTEMD
|
||||
$(INSTALL) -D -m 644 package/rpi-userland/vcfiled.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/vcfiled.service
|
||||
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
|
||||
ln -sf ../../../../usr/lib/systemd/system/vcfiled.service \
|
||||
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/vcfiled.service
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y)
|
||||
|
||||
RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON
|
||||
|
||||
define RPI_USERLAND_EXTRA_LIBS_TARGET
|
||||
$(INSTALL) -m 0644 -D \
|
||||
$(@D)/build/lib/libilclient.so \
|
||||
$(TARGET_DIR)/usr/lib/libilclient.so
|
||||
endef
|
||||
RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_EXTRA_LIBS_TARGET
|
||||
|
||||
define RPI_USERLAND_EXTRA_LIBS_STAGING
|
||||
$(INSTALL) -m 0644 -D \
|
||||
$(@D)/build/lib/libilclient.so \
|
||||
$(STAGING_DIR)/usr/lib/libilclient.so
|
||||
endef
|
||||
RPI_USERLAND_POST_INSTALL_STAGING_HOOKS += RPI_USERLAND_EXTRA_LIBS_STAGING
|
||||
|
||||
else
|
||||
|
||||
RPI_USERLAND_CONF_OPTS += -DALL_APPS=OFF
|
||||
|
||||
endif # BR2_PACKAGE_RPI_USERLAND_HELLO
|
||||
|
||||
define RPI_USERLAND_POST_TARGET_CLEANUP
|
||||
rm -f $(TARGET_DIR)/etc/init.d/vcfiled
|
||||
rm -f $(TARGET_DIR)/usr/share/install/vcfiled
|
||||
rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share/install
|
||||
rm -Rf $(TARGET_DIR)/usr/src
|
||||
endef
|
||||
RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_CLEANUP
|
||||
|
||||
$(eval $(cmake-package))
|
||||
@@ -0,0 +1,9 @@
|
||||
[Unit]
|
||||
Description=VideoCore file server daemon
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/sbin/vcfiled --foreground
|
||||
Restart=always
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
Reference in New Issue
Block a user