opensvc/gpac_bb.patch at master · gpac-buildbot/opensvc · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 293)
+++ CMakeLists.txt	(working copy)
@@ -2,28 +2,13 @@
 cmake_minimum_required (VERSION 2.6)
 project (OpenSVCDecoder)

-find_package(SDL REQUIRED)
-
 # Add libraries
 add_subdirectory(AVC/h264_baseline_decoder/lib_baseline)
 add_subdirectory(AVC/h264_main_decoder/lib_main)
 add_subdirectory(CommonFiles/src)
 add_subdirectory(SVC/lib_svc)
-add_subdirectory(SVC/libview)

 # Include directories
-include_directories(AVC/h264_baseline_decoder/lib_baseline AVC/h264_main_decoder/lib_main CommonFiles/src SVC/lib_svc ${SDL_INCLUDE_DIR})
-
- # Executable
-add_executable(OpenSVCDecoder SVC/build/PC.c)
+include_directories(AVC/h264_baseline_decoder/lib_baseline AVC/h264_main_decoder/lib_main CommonFiles/src SVC/lib_svc )

-target_link_libraries(OpenSVCDecoder ${SDL_LIBRARY} SVC_baseline AVC_main AVC_baseline DisplaySDL OpenSVCDec)

-INSTALL(TARGETS OpenSVCDecoder
-RUNTIME DESTINATION bin
-PERMISSIONS
-OWNER_READ OWNER_WRITE OWNER_EXECUTE
-GROUP_READ GROUP_EXECUTE
-WORLD_READ WORLD_EXECUTE
-)
-
Index: CommonFiles/src/CMakeLists.txt
===================================================================
--- CommonFiles/src/CMakeLists.txt	(revision 293)
+++ CommonFiles/src/CMakeLists.txt	(working copy)
@@ -1,23 +1,12 @@
-include_directories(../../AVC/h264_baseline_decoder/lib_baseline ../../AVC/h264_main_decoder/lib_main ../../SVC/lib_svc ${SDL_INCLUDE_DIR})
+include_directories(../../AVC/h264_baseline_decoder/lib_baseline ../../AVC/h264_main_decoder/lib_main ../../SVC/lib_svc)


-add_library (OpenSVCDec SHARED
+add_library (OpenSVCDec
 ControlLayer.c
 display_tcpmp.c
 H264_plg.c
 ParseAU.c
 )

-target_link_libraries(OpenSVCDec ${SDL_LIBRARY} SVC_baseline AVC_main AVC_baseline DisplaySDL)
+target_link_libraries(OpenSVCDec ${SDL_LIBRARY} SVC_baseline AVC_main AVC_baseline)

-install(DIRECTORY "."
-DESTINATION include/OpenSVCDecoder
-FILES_MATCHING
-PATTERN "*.h"
-PATTERN ".svn" EXCLUDE
-)
-
-INSTALL(TARGETS OpenSVCDec DESTINATION lib PERMISSIONS
-OWNER_READ OWNER_WRITE OWNER_EXECUTE
-GROUP_READ GROUP_EXECUTE
-WORLD_READ WORLD_EXECUTE)
\ No newline at end of file
Index: SVC/lib_svc/CMakeLists.txt
===================================================================
--- SVC/lib_svc/CMakeLists.txt	(revision 293)
+++ SVC/lib_svc/CMakeLists.txt	(working copy)
@@ -1,6 +1,5 @@
-include_directories(../../AVC/h264_baseline_decoder/lib_baseline ../../AVC/h264_main_decoder/lib_main ${SDL_INCLUDE_DIR})
+include_directories(../../AVC/h264_baseline_decoder/lib_baseline ../../AVC/h264_main_decoder/lib_main)

-ADD_DEFINITIONS(-DHAVE_SDL)

 add_library (SVC_baseline
 B_BL.c