Rename opengl module to movit

Author: bmatherly

CMakeLists.txt

@@ -23,7 +23,7 @@ option(MOD_NDI "Enable NDI module" OFF)
 option(MOD_NORMALIZE "Enable normalize module" ON)
 option(MOD_OLDFILM "Enable oldfilm module" ON)
 option(MOD_OPENCV "Enable OpenCV module" OFF)
-option(MOD_OPENGL "Enable OpenGL module" ON)
+option(MOD_MOVIT "Enable OpenGL module" ON)
 option(MOD_PLUS "Enable plus module" ON)
 option(MOD_PLUSGPL "Enable plus GPL module" ON)
 option(MOD_QT "Enable Qt module" ON)
@@ -252,16 +252,16 @@ if(MOD_OPENCV)
   endif()
 endif()
 
-if(MOD_OPENGL)
+if(MOD_MOVIT)
   pkg_check_modules(movit IMPORTED_TARGET movit)
   find_package(OpenGL)
   if(TARGET PkgConfig::movit AND TARGET OpenGL::GL)
     if(UNIX AND NOT APPLE)
       find_package(X11 REQUIRED)
     endif()
-    list(APPEND MLT_SUPPORTED_COMPONENTS opengl)
+    list(APPEND MLT_SUPPORTED_COMPONENTS movit)
   else()
-    set(MOD_OPENGL OFF)
+    set(MOD_MOVIT OFF)
   endif()
 endif()
 

docs/install.txt

@@ -33,7 +33,7 @@ Last Revision: 2013-09-07
          * motion_est    - motion estimation-based filters (*)
          * normalize     - audio normalisation functions (*)
          * oldfilm       - filters to make pristine video dirty
-         * opengl        - !OpenGL dependent services (*)
+         * movit         - Movit dependent services (*)
          * plus          - miscellaneous services (pending move to core)
          * qt            - Qt dependent services (*)
          * resample      - libresample dependent services (*)
@@ -71,7 +71,7 @@ Last Revision: 2013-09-07
    | *Module* | *Description* |
    | avformat | [[http://www.ffmpeg.org][FFmpeg]] v4.0 or later |
    | jackrack | [[http://jackaudio.org][JACK]], [[http://www.xmlsoft.org/][libxml2]], and ladspa.h |
-   | opengl   | [[http://git.sesse.net/movit][Movit]] |
+   | movit    | [[http://git.sesse.net/movit][Movit]] |
    | qt       | [[http://www.qt-project.org][Qt]] 4.4 or later |
    | resample | [[http://www.mega-nerd.com/SRC][libsamplerate]] 0.15 or later |
    | sdl      | [[http://www.libsdl.org][SDL]] 1.2 or later |

src/modules/CMakeLists.txt

@@ -44,8 +44,8 @@ if(MOD_OPENCV)
   add_subdirectory(opencv)
 endif()
 
-if(MOD_OPENGL)
-  add_subdirectory(opengl)
+if(MOD_MOVIT)
+  add_subdirectory(movit)
 endif()
 
 if(MOD_PLUS)

src/modules/opengl/CMakeLists.txt renamed to src/modules/movit/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(mltopengl MODULE
+add_library(mltmovit MODULE
   consumer_xgl.c
   factory.c
   filter_glsl_manager.cpp
@@ -24,20 +24,20 @@ add_library(mltopengl MODULE
   transition_movit_overlay.cpp
 )
 
-target_compile_options(mltopengl PRIVATE ${MLT_COMPILE_OPTIONS})
+target_compile_options(mltmovit PRIVATE ${MLT_COMPILE_OPTIONS})
 
-target_link_libraries(mltopengl PRIVATE m Threads::Threads mlt mlt++ OpenGL::GL PkgConfig::movit)
+target_link_libraries(mltmovit PRIVATE m Threads::Threads mlt mlt++ OpenGL::GL PkgConfig::movit)
 
 if(UNIX AND NOT APPLE)
-  target_link_libraries(mltopengl PRIVATE X11::X11)
+  target_link_libraries(mltmovit PRIVATE X11::X11)
 endif()
 
 pkg_get_variable(SHADERDIR movit shaderdir)
-target_compile_definitions(mltopengl PRIVATE SHADERDIR="${SHADERDIR}")
+target_compile_definitions(mltmovit PRIVATE SHADERDIR="${SHADERDIR}")
 
-set_target_properties(mltopengl PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
+set_target_properties(mltmovit PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltopengl LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
+install(TARGETS mltmovit LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
 
 install(FILES
   filter_movit_blur.yml

src/modules/opengl/Makefile renamed to src/modules/movit/Makefile

@@ -4,7 +4,7 @@ CFLAGS := -I../.. $(CFLAGS)
 
 LDFLAGS := -L../../framework -lmlt -lm $(LDFLAGS)
 
-TARGET = ../libmltopengl$(LIBSUF)
+TARGET = ../libmltmovit$(LIBSUF)
 
 OBJS = factory.o
 
@@ -75,8 +75,8 @@ clean:
 
 install: all
 	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
-	install -d "$(DESTDIR)$(mltdatadir)/opengl"
-	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/opengl"
+	install -d "$(DESTDIR)$(mltdatadir)/movit"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/movit"
 
 ifneq ($(wildcard .depend),)
 include .depend

src/modules/opengl/configure renamed to src/modules/movit/configure

@@ -5,7 +5,7 @@ then
 	if ! $(pkg-config movit)
 	then
 		echo "- movit not found: disabling"
-		touch ../disable-opengl
+		touch ../disable-movit
 		exit 0
 	fi
 

src/modules/opengl/consumer_xgl.c renamed to src/modules/movit/consumer_xgl.c

@@ -48,7 +48,7 @@ extern mlt_transition transition_movit_overlay_init( mlt_profile profile, mlt_se
 static mlt_properties metadata( mlt_service_type type, const char *id, void *data )
 {
 	char file[ PATH_MAX ];
-	snprintf( file, PATH_MAX, "%s/opengl/%s", mlt_environment( "MLT_DATA" ), (char*) data );
+	snprintf( file, PATH_MAX, "%s/movit/%s", mlt_environment( "MLT_DATA" ), (char*) data );
 	return mlt_properties_parse_yaml( file );
 }