external/miraclecast
1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-03-09 23:38:56 +00:00
Code Issues Releases Wiki Activity

move miracle-wfdctl from demo/ to res/

Browse source 
Change-Id: I37df75135e4713a73d3c63353c9a17dc248e2d7e
This commit is contained in:
Derek Dai 2017-05-08 15:30:28 +08:00
parent 1129625c66
commit 6d1591de00
No known key found for this signature in database
GPG key ID: E109CC97553EF009
16 changed files with 115 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -12,7 +12,6 @@ SET(BUILD_BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
OPTION(BUILD_ENABLE_DEBUG "Enable Debug" ON ) OPTION(BUILD_ENABLE_DEBUG "Enable Debug" ON )
OPTION(RELY_UDEV "Rely in udev tag to select device" OFF ) OPTION(RELY_UDEV "Rely in udev tag to select device" OFF )
OPTION(BUILD_TESTS "Enable TEST" ON ) OPTION(BUILD_TESTS "Enable TEST" ON )
OPTION(BUILD_DEMO "Enable DEMO" OFF )
if(BUILD_ENABLE_DEBUG) if(BUILD_ENABLE_DEBUG)
add_definitions(-DBUILD_ENABLE_DEBUG) add_definitions(-DBUILD_ENABLE_DEBUG)
@ -51,7 +50,3 @@ add_subdirectory(src)
add_subdirectory(res) add_subdirectory(res)
add_subdirectory(test) add_subdirectory(test)
if(BUILD_DEMO)
add_subdirectory(demo)
endif()

1
debian/postrm vendored Normal file
View file

@ -0,0 +1 @@
systemctl daemon-reload

3
debian/rules vendored
View file

@ -20,6 +20,3 @@
# dh_make generated override targets # dh_make generated override targets
# This is example for Cmake (See https://bugs.debian.org/641051 ) # This is example for Cmake (See https://bugs.debian.org/641051 )
override_dh_auto_configure:
dh_auto_configure -- -DBUILD_DEMO=yes

39
demo/CMakeLists.txt
View file

@ -1,39 +0,0 @@
find_library(READLINE REQUIRED)
pkg_check_modules(GIO2 REQUIRED gio-2.0)
pkg_check_modules(GDK3 REQUIRED gdk-3.0)
include(ValaPrecompile)
include_directories(${GIO2_INCLUDE_DIRS}
${GDK3_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
)
set(CMAKE_C_FLAGS "-Wno-deprecated-declarations ${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS "-Wno-unused-but-set-variable ${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS "-Wno-missing-braces ${CMAKE_C_FLAGS}")
if(VALA_VERSION VERSION_GREATER 0.34.0 AND NOT GDK_VERSION_NEWER_THEN_3_22)
list(APPEND VALA_EXTRA_OPTIONS -D GDK3_HAS_MONITOR_CLASS)
endif()
vala_precompile(WFDCTL_SRC wfdctl
wfdctl.vala
networkmanager.vala
miracle-wifi.vala
miracle-wfd.vala
GENERATE_HEADER
wfdctl.h
CUSTOM_VAPIS
sigint.vapi
OPTIONS
--target-glib=2.50
${VALA_EXTRA_OPTIONS}
PACKAGES
gio-2.0
gdk-3.0
)
add_executable(miracle-wfdctl ${WFDCTL_SRC} sigint.c)
target_link_libraries(miracle-wfdctl ${GIO2_LIBRARIES} ${GDK3_LIBRARIES})
install(TARGETS miracle-wfdctl DESTINATION bin)

24
demo/meson.build
View file

@ -1,24 +0,0 @@
add_languages('vala')
gio2 = dependency('gio-2.0')
gdk3 = dependency('gdk-3.0')
valac = meson.get_compiler('vala')
valac_extra_args = []
if valac.version().version_compare('>=0.34') and gdk3.version().version_compare('>=3.22')
valac_extra_args += ['-D', 'GDK3_HAS_MONITOR_CLASS']
endif
miracle_wfdctl_src = ['wfdctl.vala',
'sigint.vapi',
'sigint.c',
'networkmanager.vala',
'miracle-wifi.vala',
'miracle-wfd.vala'
]
executable('miracle-wfdctl', miracle_wfdctl_src,
dependencies: [gio2, gdk3],
vala_args: valac_extra_args,
install: true
)

4
meson.build
View file

@ -42,7 +42,3 @@ subdir('res')
if get_option('build-tests') if get_option('build-tests')
subdir('test') subdir('test')
endif endif
if get_option('build-demo')
subdir('demo')
endif

4
meson_options.txt
View file

@ -10,7 +10,3 @@ option('build-tests',
type: 'boolean', type: 'boolean',
value: true, value: true,
description: 'Enable TEST') description: 'Enable TEST')
option('build-demo',
type: 'boolean',
value: false,
description: 'Enable DEMO')

159
res/CMakeLists.txt
View file

@ -1,69 +1,3 @@
########### install files ###############
execute_process(
COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=system_bus_services_dir dbus-1
OUTPUT_VARIABLE DBUS_SYSTEM_SERVICES_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
execute_process(
COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd
OUTPUT_VARIABLE SYSTEMD_SYSTEM_UNIT_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
configure_file(
miracle-wifid.service.cmake
miracle-wifid.service
)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/miracle-wifid.service
DESTINATION ${SYSTEMD_SYSTEM_UNIT_DIR}/
)
install(
CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink miracle-wifid.service \$ENV{DESTDIR}/${SYSTEMD_SYSTEM_UNIT_DIR}/dbus-org.freedesktop.miracle.wifi.service)"
)
configure_file(
miracle-dispd.service.cmake
miracle-dispd.service
)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/miracle-dispd.service
DESTINATION ${SYSTEMD_SYSTEM_UNIT_DIR}/
)
install(
CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink miracle-dispd.service \$ENV{DESTDIR}/${SYSTEMD_SYSTEM_UNIT_DIR}/dbus-org.freedesktop.miracle.wfd.service)"
)
configure_file(
org.freedesktop.miracle.wifi.service.cmake
org.freedesktop.miracle.wifi.service
)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.miracle.wifi.service
DESTINATION ${DBUS_SYSTEM_SERVICES_DIR}/
)
configure_file(
org.freedesktop.miracle.wfd.service.cmake
org.freedesktop.miracle.wfd.service
)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.miracle.wfd.service
DESTINATION ${DBUS_SYSTEM_SERVICES_DIR}/
)
install(
PROGRAMS miracle-gst gstplayer uibc-viewer
DESTINATION bin
)
install(
FILES org.freedesktop.miracle.conf
DESTINATION /etc/dbus-1/system.d
)
include(ValaPrecompile) include(ValaPrecompile)
pkg_check_modules(GIO2 REQUIRED gio-2.0) pkg_check_modules(GIO2 REQUIRED gio-2.0)
pkg_check_modules(GDK3 REQUIRED gdk-3.0) pkg_check_modules(GDK3 REQUIRED gdk-3.0)
@ -73,11 +7,15 @@ include_directories(
${GST1_INCLUDE_DIRS} ${GST1_INCLUDE_DIRS}
${GDK3_INCLUDE_DIRS} ${GDK3_INCLUDE_DIRS}
${GIO_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
) )
set(CMAKE_C_FLAGS "-Wno-deprecated-declarations ${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "-Wno-deprecated-declarations ${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS "-Wno-unused-but-set-variable ${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "-Wno-unused-but-set-variable ${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS "-Wno-missing-braces ${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "-Wno-missing-braces ${CMAKE_C_FLAGS}")
if(VALA_VERSION VERSION_GREATER 0.34.0 AND NOT GDK_VERSION_NEWER_THEN_3_22)
list(APPEND VALA_EXTRA_OPTIONS -D GDK3_HAS_MONITOR_CLASS)
endif()
vala_precompile( vala_precompile(
GSTENCODER_SRC gstencoder GSTENCODER_SRC gstencoder
@ -89,7 +27,6 @@ vala_precompile(
gio-2.0 gio-2.0
posix posix
) )
add_executable(gstencoder ${GSTENCODER_SRC}) add_executable(gstencoder ${GSTENCODER_SRC})
target_link_libraries( target_link_libraries(
gstencoder gstencoder
@ -98,4 +35,92 @@ target_link_libraries(
${GIO2_LIBRARIES} ${GIO2_LIBRARIES}
) )
vala_precompile(
WFDCTL_SRC wfdctl
wfdctl.vala
networkmanager.vala
miracle-wifi.vala
miracle-wfd.vala
GENERATE_HEADER
wfdctl.h
CUSTOM_VAPIS
sigint.vapi
OPTIONS
--target-glib=2.50
${VALA_EXTRA_OPTIONS}
PACKAGES
gio-2.0
gdk-3.0
)
add_executable(miracle-wfdctl ${WFDCTL_SRC} sigint.c)
target_link_libraries(miracle-wfdctl ${GIO2_LIBRARIES} ${GDK3_LIBRARIES})
########### install files ###############
install(TARGETS gstencoder DESTINATION bin) install(TARGETS gstencoder DESTINATION bin)
install(TARGETS miracle-wfdctl DESTINATION bin)
execute_process(
COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=system_bus_services_dir dbus-1
OUTPUT_VARIABLE DBUS_SYSTEM_SERVICES_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
execute_process(
COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd
OUTPUT_VARIABLE SYSTEMD_SYSTEM_UNIT_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
configure_file(
miracle-wifid.service.cmake
miracle-wifid.service
)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/miracle-wifid.service
DESTINATION ${SYSTEMD_SYSTEM_UNIT_DIR}/
)
install(
CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink miracle-wifid.service \$ENV{DESTDIR}${SYSTEMD_SYSTEM_UNIT_DIR}/dbus-org.freedesktop.miracle.wifi.service)"
)
configure_file(
miracle-dispd.service.cmake
miracle-dispd.service
)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/miracle-dispd.service
DESTINATION ${SYSTEMD_SYSTEM_UNIT_DIR}/
)
install(
CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink miracle-dispd.service \$ENV{DESTDIR}${SYSTEMD_SYSTEM_UNIT_DIR}/dbus-org.freedesktop.miracle.wfd.service)"
)
configure_file(
org.freedesktop.miracle.wifi.service.cmake
org.freedesktop.miracle.wifi.service
)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.miracle.wifi.service
DESTINATION $ENV{DESTDIR}${DBUS_SYSTEM_SERVICES_DIR}/
)
configure_file(
org.freedesktop.miracle.wfd.service.cmake
org.freedesktop.miracle.wfd.service
)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.miracle.wfd.service
DESTINATION $ENV{DESTDIR}${DBUS_SYSTEM_SERVICES_DIR}/
)
install(
PROGRAMS miracle-gst gstplayer uibc-viewer
DESTINATION bin
)
install(
FILES org.freedesktop.miracle.conf
DESTINATION $ENV{DESTDIR}/etc/dbus-1/system.d
)

23
res/meson.build
View file

@ -43,11 +43,32 @@ install_data('miracle-gst', 'gstplayer', 'uibc-viewer',
install_dir: get_option('bindir'), install_dir: get_option('bindir'),
install_mode: 'rwxr-xr-x') install_mode: 'rwxr-xr-x')
add_languages('vala')
gio2 = dependency('gio-2.0') gio2 = dependency('gio-2.0')
gdk3 = dependency('gdk-3.0')
gst1 = dependency('gstreamer-1.0') gst1 = dependency('gstreamer-1.0')
gst1_base = dependency('gstreamer-base-1.0') gst1_base = dependency('gstreamer-base-1.0')
add_languages('vala')
valac = meson.get_compiler('vala')
valac_extra_args = []
if valac.version().version_compare('>=0.34') and gdk3.version().version_compare('>=3.22')
valac_extra_args += ['-D', 'GDK3_HAS_MONITOR_CLASS']
endif
executable('gstencoder', 'gstencoder.vala', executable('gstencoder', 'gstencoder.vala',
dependencies: [gst1, gst1_base, gio2], dependencies: [gst1, gst1_base, gio2],
install: true, install: true,
vala_args: ['--pkg=posix']) vala_args: ['--pkg=posix'])
miracle_wfdctl_src = ['wfdctl.vala',
'sigint.vapi',
'sigint.c',
'networkmanager.vala',
'miracle-wifi.vala',
'miracle-wfd.vala'
]
executable('miracle-wfdctl', miracle_wfdctl_src,
dependencies: [gio2, gdk3],
vala_args: valac_extra_args,
install: true
)

0
demo/miracle-wfd.vala → res/miracle-wfd.vala
View file

0
demo/miracle-wifi.vala → res/miracle-wifi.vala
View file

0
demo/networkmanager.vala → res/networkmanager.vala
View file

0
demo/sigint.c → res/sigint.c
View file

0
demo/sigint.h → res/sigint.h
View file

0
demo/sigint.vapi → res/sigint.vapi
View file

0
demo/wfdctl.vala → res/wfdctl.vala
View file