From a9cd60a78f512a40a38e9a5c11aacde6a7aa347f Mon Sep 17 00:00:00 2001 From: jp9000 Date: Fri, 29 Aug 2014 16:22:14 -0700 Subject: [PATCH] Rename linux-xshm module to linux-capture --- plugins/CMakeLists.txt | 2 +- plugins/linux-capture/CMakeLists.txt | 30 +++++++++++++++++++ plugins/{linux-xshm => linux-capture}/README | 0 .../data/locale/ar-SA.ini | 0 .../data/locale/da-DK.ini | 0 .../data/locale/de-DE.ini | 0 .../data/locale/en-US.ini | 0 .../data/locale/es-ES.ini | 0 .../data/locale/eu-ES.ini | 0 .../data/locale/fi-FI.ini | 0 .../data/locale/fr-FR.ini | 0 .../data/locale/gl-ES.ini | 0 .../data/locale/hr-HR.ini | 0 .../data/locale/hu-HU.ini | 0 .../data/locale/it-IT.ini | 0 .../data/locale/ja-JP.ini | 0 .../data/locale/ko-KR.ini | 0 .../data/locale/nb-NO.ini | 0 .../data/locale/nl-NL.ini | 0 .../data/locale/pl-PL.ini | 0 .../data/locale/pt-BR.ini | 0 .../data/locale/pt-PT.ini | 0 .../data/locale/ro-RO.ini | 0 .../data/locale/ru-RU.ini | 0 .../data/locale/sl-SI.ini | 0 .../data/locale/sr-CS.ini | 0 .../data/locale/sr-SP.ini | 0 .../data/locale/sv-SE.ini | 0 .../data/locale/tr-TR.ini | 0 .../data/locale/zh-TW.ini | 0 .../linux-capture.c} | 0 .../{linux-xshm => linux-capture}/xcursor.c | 0 .../{linux-xshm => linux-capture}/xcursor.h | 0 .../{linux-xshm => linux-capture}/xhelpers.c | 0 .../{linux-xshm => linux-capture}/xhelpers.h | 0 .../xshm-input.c | 0 plugins/linux-xshm/CMakeLists.txt | 30 ------------------- 37 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 plugins/linux-capture/CMakeLists.txt rename plugins/{linux-xshm => linux-capture}/README (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/ar-SA.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/da-DK.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/de-DE.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/en-US.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/es-ES.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/eu-ES.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/fi-FI.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/fr-FR.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/gl-ES.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/hr-HR.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/hu-HU.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/it-IT.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/ja-JP.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/ko-KR.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/nb-NO.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/nl-NL.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/pl-PL.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/pt-BR.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/pt-PT.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/ro-RO.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/ru-RU.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/sl-SI.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/sr-CS.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/sr-SP.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/sv-SE.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/tr-TR.ini (100%) rename plugins/{linux-xshm => linux-capture}/data/locale/zh-TW.ini (100%) rename plugins/{linux-xshm/linux-xshm.c => linux-capture/linux-capture.c} (100%) rename plugins/{linux-xshm => linux-capture}/xcursor.c (100%) rename plugins/{linux-xshm => linux-capture}/xcursor.h (100%) rename plugins/{linux-xshm => linux-capture}/xhelpers.c (100%) rename plugins/{linux-xshm => linux-capture}/xhelpers.h (100%) rename plugins/{linux-xshm => linux-capture}/xshm-input.c (100%) delete mode 100644 plugins/linux-xshm/CMakeLists.txt diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index f2d6ae0ae..5c2e5ab76 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -7,7 +7,7 @@ elseif(APPLE) add_subdirectory(mac-avcapture) add_subdirectory(mac-capture) elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") - add_subdirectory(linux-xshm) + add_subdirectory(linux-capture) add_subdirectory(linux-xcomposite) add_subdirectory(linux-pulseaudio) add_subdirectory(linux-v4l2) diff --git a/plugins/linux-capture/CMakeLists.txt b/plugins/linux-capture/CMakeLists.txt new file mode 100644 index 000000000..d05a5fa84 --- /dev/null +++ b/plugins/linux-capture/CMakeLists.txt @@ -0,0 +1,30 @@ +project(linux-capture) + +find_package(X11 REQUIRED) + +include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/libobs") + +set(linux-capture_SOURCES + linux-capture.c + xcursor.c + xhelpers.c + capture-input.c +) +set(linux-capture_HEADERS + xcursor.h + xhelpers.h +) + +add_library(linux-capture MODULE + ${linux-capture_SOURCES} + ${linux-capture_HEADERS} +) +target_link_libraries(linux-capture + libobs + ${X11_LIBRARIES} + ${X11_XShm_LIB} + ${X11_Xfixes_LIB} + ${X11_Xinerama_LIB} +) + +install_obs_plugin_with_data(linux-capture data) diff --git a/plugins/linux-xshm/README b/plugins/linux-capture/README similarity index 100% rename from plugins/linux-xshm/README rename to plugins/linux-capture/README diff --git a/plugins/linux-xshm/data/locale/ar-SA.ini b/plugins/linux-capture/data/locale/ar-SA.ini similarity index 100% rename from plugins/linux-xshm/data/locale/ar-SA.ini rename to plugins/linux-capture/data/locale/ar-SA.ini diff --git a/plugins/linux-xshm/data/locale/da-DK.ini b/plugins/linux-capture/data/locale/da-DK.ini similarity index 100% rename from plugins/linux-xshm/data/locale/da-DK.ini rename to plugins/linux-capture/data/locale/da-DK.ini diff --git a/plugins/linux-xshm/data/locale/de-DE.ini b/plugins/linux-capture/data/locale/de-DE.ini similarity index 100% rename from plugins/linux-xshm/data/locale/de-DE.ini rename to plugins/linux-capture/data/locale/de-DE.ini diff --git a/plugins/linux-xshm/data/locale/en-US.ini b/plugins/linux-capture/data/locale/en-US.ini similarity index 100% rename from plugins/linux-xshm/data/locale/en-US.ini rename to plugins/linux-capture/data/locale/en-US.ini diff --git a/plugins/linux-xshm/data/locale/es-ES.ini b/plugins/linux-capture/data/locale/es-ES.ini similarity index 100% rename from plugins/linux-xshm/data/locale/es-ES.ini rename to plugins/linux-capture/data/locale/es-ES.ini diff --git a/plugins/linux-xshm/data/locale/eu-ES.ini b/plugins/linux-capture/data/locale/eu-ES.ini similarity index 100% rename from plugins/linux-xshm/data/locale/eu-ES.ini rename to plugins/linux-capture/data/locale/eu-ES.ini diff --git a/plugins/linux-xshm/data/locale/fi-FI.ini b/plugins/linux-capture/data/locale/fi-FI.ini similarity index 100% rename from plugins/linux-xshm/data/locale/fi-FI.ini rename to plugins/linux-capture/data/locale/fi-FI.ini diff --git a/plugins/linux-xshm/data/locale/fr-FR.ini b/plugins/linux-capture/data/locale/fr-FR.ini similarity index 100% rename from plugins/linux-xshm/data/locale/fr-FR.ini rename to plugins/linux-capture/data/locale/fr-FR.ini diff --git a/plugins/linux-xshm/data/locale/gl-ES.ini b/plugins/linux-capture/data/locale/gl-ES.ini similarity index 100% rename from plugins/linux-xshm/data/locale/gl-ES.ini rename to plugins/linux-capture/data/locale/gl-ES.ini diff --git a/plugins/linux-xshm/data/locale/hr-HR.ini b/plugins/linux-capture/data/locale/hr-HR.ini similarity index 100% rename from plugins/linux-xshm/data/locale/hr-HR.ini rename to plugins/linux-capture/data/locale/hr-HR.ini diff --git a/plugins/linux-xshm/data/locale/hu-HU.ini b/plugins/linux-capture/data/locale/hu-HU.ini similarity index 100% rename from plugins/linux-xshm/data/locale/hu-HU.ini rename to plugins/linux-capture/data/locale/hu-HU.ini diff --git a/plugins/linux-xshm/data/locale/it-IT.ini b/plugins/linux-capture/data/locale/it-IT.ini similarity index 100% rename from plugins/linux-xshm/data/locale/it-IT.ini rename to plugins/linux-capture/data/locale/it-IT.ini diff --git a/plugins/linux-xshm/data/locale/ja-JP.ini b/plugins/linux-capture/data/locale/ja-JP.ini similarity index 100% rename from plugins/linux-xshm/data/locale/ja-JP.ini rename to plugins/linux-capture/data/locale/ja-JP.ini diff --git a/plugins/linux-xshm/data/locale/ko-KR.ini b/plugins/linux-capture/data/locale/ko-KR.ini similarity index 100% rename from plugins/linux-xshm/data/locale/ko-KR.ini rename to plugins/linux-capture/data/locale/ko-KR.ini diff --git a/plugins/linux-xshm/data/locale/nb-NO.ini b/plugins/linux-capture/data/locale/nb-NO.ini similarity index 100% rename from plugins/linux-xshm/data/locale/nb-NO.ini rename to plugins/linux-capture/data/locale/nb-NO.ini diff --git a/plugins/linux-xshm/data/locale/nl-NL.ini b/plugins/linux-capture/data/locale/nl-NL.ini similarity index 100% rename from plugins/linux-xshm/data/locale/nl-NL.ini rename to plugins/linux-capture/data/locale/nl-NL.ini diff --git a/plugins/linux-xshm/data/locale/pl-PL.ini b/plugins/linux-capture/data/locale/pl-PL.ini similarity index 100% rename from plugins/linux-xshm/data/locale/pl-PL.ini rename to plugins/linux-capture/data/locale/pl-PL.ini diff --git a/plugins/linux-xshm/data/locale/pt-BR.ini b/plugins/linux-capture/data/locale/pt-BR.ini similarity index 100% rename from plugins/linux-xshm/data/locale/pt-BR.ini rename to plugins/linux-capture/data/locale/pt-BR.ini diff --git a/plugins/linux-xshm/data/locale/pt-PT.ini b/plugins/linux-capture/data/locale/pt-PT.ini similarity index 100% rename from plugins/linux-xshm/data/locale/pt-PT.ini rename to plugins/linux-capture/data/locale/pt-PT.ini diff --git a/plugins/linux-xshm/data/locale/ro-RO.ini b/plugins/linux-capture/data/locale/ro-RO.ini similarity index 100% rename from plugins/linux-xshm/data/locale/ro-RO.ini rename to plugins/linux-capture/data/locale/ro-RO.ini diff --git a/plugins/linux-xshm/data/locale/ru-RU.ini b/plugins/linux-capture/data/locale/ru-RU.ini similarity index 100% rename from plugins/linux-xshm/data/locale/ru-RU.ini rename to plugins/linux-capture/data/locale/ru-RU.ini diff --git a/plugins/linux-xshm/data/locale/sl-SI.ini b/plugins/linux-capture/data/locale/sl-SI.ini similarity index 100% rename from plugins/linux-xshm/data/locale/sl-SI.ini rename to plugins/linux-capture/data/locale/sl-SI.ini diff --git a/plugins/linux-xshm/data/locale/sr-CS.ini b/plugins/linux-capture/data/locale/sr-CS.ini similarity index 100% rename from plugins/linux-xshm/data/locale/sr-CS.ini rename to plugins/linux-capture/data/locale/sr-CS.ini diff --git a/plugins/linux-xshm/data/locale/sr-SP.ini b/plugins/linux-capture/data/locale/sr-SP.ini similarity index 100% rename from plugins/linux-xshm/data/locale/sr-SP.ini rename to plugins/linux-capture/data/locale/sr-SP.ini diff --git a/plugins/linux-xshm/data/locale/sv-SE.ini b/plugins/linux-capture/data/locale/sv-SE.ini similarity index 100% rename from plugins/linux-xshm/data/locale/sv-SE.ini rename to plugins/linux-capture/data/locale/sv-SE.ini diff --git a/plugins/linux-xshm/data/locale/tr-TR.ini b/plugins/linux-capture/data/locale/tr-TR.ini similarity index 100% rename from plugins/linux-xshm/data/locale/tr-TR.ini rename to plugins/linux-capture/data/locale/tr-TR.ini diff --git a/plugins/linux-xshm/data/locale/zh-TW.ini b/plugins/linux-capture/data/locale/zh-TW.ini similarity index 100% rename from plugins/linux-xshm/data/locale/zh-TW.ini rename to plugins/linux-capture/data/locale/zh-TW.ini diff --git a/plugins/linux-xshm/linux-xshm.c b/plugins/linux-capture/linux-capture.c similarity index 100% rename from plugins/linux-xshm/linux-xshm.c rename to plugins/linux-capture/linux-capture.c diff --git a/plugins/linux-xshm/xcursor.c b/plugins/linux-capture/xcursor.c similarity index 100% rename from plugins/linux-xshm/xcursor.c rename to plugins/linux-capture/xcursor.c diff --git a/plugins/linux-xshm/xcursor.h b/plugins/linux-capture/xcursor.h similarity index 100% rename from plugins/linux-xshm/xcursor.h rename to plugins/linux-capture/xcursor.h diff --git a/plugins/linux-xshm/xhelpers.c b/plugins/linux-capture/xhelpers.c similarity index 100% rename from plugins/linux-xshm/xhelpers.c rename to plugins/linux-capture/xhelpers.c diff --git a/plugins/linux-xshm/xhelpers.h b/plugins/linux-capture/xhelpers.h similarity index 100% rename from plugins/linux-xshm/xhelpers.h rename to plugins/linux-capture/xhelpers.h diff --git a/plugins/linux-xshm/xshm-input.c b/plugins/linux-capture/xshm-input.c similarity index 100% rename from plugins/linux-xshm/xshm-input.c rename to plugins/linux-capture/xshm-input.c diff --git a/plugins/linux-xshm/CMakeLists.txt b/plugins/linux-xshm/CMakeLists.txt deleted file mode 100644 index 1ca91557b..000000000 --- a/plugins/linux-xshm/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -project(linux-xshm) - -find_package(X11 REQUIRED) - -include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/libobs") - -set(linux-xshm_SOURCES - linux-xshm.c - xcursor.c - xhelpers.c - xshm-input.c -) -set(linux-xshm_HEADERS - xcursor.h - xhelpers.h -) - -add_library(linux-xshm MODULE - ${linux-xshm_SOURCES} - ${linux-xshm_HEADERS} -) -target_link_libraries(linux-xshm - libobs - ${X11_LIBRARIES} - ${X11_XShm_LIB} - ${X11_Xfixes_LIB} - ${X11_Xinerama_LIB} -) - -install_obs_plugin_with_data(linux-xshm data)