From c3fc3231504c34b74f8f44a924f7a92cd54976f0 Mon Sep 17 00:00:00 2001 From: Aditya Pratap Singh Date: Mon, 7 Mar 2022 17:50:11 +0530 Subject: [PATCH] [IMPROVEMENT] Deprecated the --with-gui flag for linux/configure and mac/configure (#1415) * Deprecated the --with-gui flag for linux/configure and mac/configure * Update docs/CHANGES.TXT Co-authored-by: Willem Co-authored-by: Willem --- .gitignore | 3 +++ docs/CHANGES.TXT | 1 + docs/COMPILATION.MD | 34 +++---------------------- linux/Makefile.am | 59 -------------------------------------------- linux/configure.ac | 6 ----- mac/Makefile.am | 60 --------------------------------------------- mac/configure.ac | 6 ----- 7 files changed, 7 insertions(+), 162 deletions(-) diff --git a/.gitignore b/.gitignore index 59338586..a64a8185 100644 --- a/.gitignore +++ b/.gitignore @@ -140,3 +140,6 @@ mac/CMakeCache.txt # Bazel bazel* + +#Intellij IDEs +.idea/ \ No newline at end of file diff --git a/docs/CHANGES.TXT b/docs/CHANGES.TXT index 44fc4292..1d5f4467 100644 --- a/docs/CHANGES.TXT +++ b/docs/CHANGES.TXT @@ -1,6 +1,7 @@ 0.95 (to be released) ----------------- - Fix: crash in Rust decoder on ATSC1.0 TS Files (#1407) +- Removed the --with-gui flag for linux/configure and mac/configure (use the Flutter GUI instead) - Fix: segmentation fault in using hardsubx 0.94 (2021-12-14) diff --git a/docs/COMPILATION.MD b/docs/COMPILATION.MD index aca45f22..624fe4d9 100644 --- a/docs/COMPILATION.MD +++ b/docs/COMPILATION.MD @@ -94,22 +94,9 @@ sudo make install `-DWITHOUT_RUST=ON` to disable rust. `-DWITH_HARDSUBX=ON` to enable burned-in subtitles -### Compiling with GUI: +### Compiling with GUI -To build CCExtractor with a GUI, you will additionally need to install [GLEW](http://glew.sourceforge.net/build.html) and [GLFW](http://www.glfw.org/docs/latest/compile.html) - -In order to compile it, you'll need to configure it using autoconf by passing the `-with-gui` option. - -```bash -./autogen.sh -./configure --with-gui -make - -# make build systemwide -sudo make install -``` - -Once set up you can run the GUI interface from the terminal `./ccextractorGUI` +The GUI for CCExtractor has been moved to a separate repository ([https://github.com/CCExtractor/ccextractorfluttergui](https://github.com/CCExtractor/ccextractorfluttergui)). ## macOS @@ -178,22 +165,7 @@ make #### Compiling with GUI: -To use CCExtractor with a gui you will additionally need to install GLEW and GLFW. You can do that by installing it via homebrew using: - -```bash -brew install glfw -brew install glew -``` - -In order to compile it, you'll need to configure it using autoconf by passing the `-with-gui` option. - -```bash -./autogen.sh -./configure --with-gui #OR .configure --with-gui --without-rust -make -``` - -Once set up, you can run the GUI interface from the terminal `./ccextractorGUI` +The GUI for CCExtractor has been moved to a separate repository ([https://github.com/CCExtractor/ccextractorfluttergui](https://github.com/CCExtractor/ccextractorfluttergui)). ## Windows Dependencies are clang and rust. To enable OCR, rust i686-pc-windows-msvc target should be installed diff --git a/linux/Makefile.am b/linux/Makefile.am index b6bcb0ce..555eba37 100644 --- a/linux/Makefile.am +++ b/linux/Makefile.am @@ -400,62 +400,3 @@ endif EXTRA_DIST = ../src/thirdparty/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm ../src/thirdparty/utf8proc/utf8proc_data.c fonts/ icon/ -#For GUI -if BUILD_WITH_GUI -bin_PROGRAMS += ccextractorGUI - -ccextractorGUI_SOURCES = \ - ../src/GUI/ccextractorGUI.c \ - ../src/GUI/ccextractorGUI.h \ - ../src/GUI/activity.c \ - ../src/GUI/activity.h \ - ../src/GUI/terminal.c \ - ../src/GUI/preview.c \ - ../src/GUI/preview.h \ - ../src/GUI/ccx_cli_thread.c \ - ../src/GUI/ccx_cli_thread.h \ - ../src/GUI/command_builder.c \ - ../src/GUI/command_builder.h \ - ../src/GUI/save_load_data.c \ - ../src/GUI/save_load_data.h \ - ../src/GUI/file_browser.c \ - ../src/GUI/file_browser.h \ - ../src/GUI/popups.c \ - ../src/GUI/popups.h \ - ../src/GUI/tabs.c \ - ../src/GUI/tabs.h \ - ../src/GUI/stb_image.h \ - ../src/GUI/nuklear_lib/nuklear.h \ - ../src/GUI/nuklear_lib/nuklear_glfw_gl2.h - -ccextractorGUI_CFLAGS = -std=gnu99 - - -ccextractorGUI_LDADD = ${glfw3_LIBS} - - -if SYS_IS_LINUX -ccextractorGUI_CFLAGS += -s -O3 -DUNIX -ccextractorGUI_CFLAGS += ${glew_CFLAGS} -ccextractorGUI_LDADD += ${glew_LIBS} -ccextractorGUI_LDADD += -lX11 -lXinerama -lXcursor -lXi -lXrandr -lXxf86vm -lm -ldl -lpthread -endif - -if SYS_IS_MAC -ccextractorGUI_CFLAGS += -O3 -DUNIX -ccextractorGUI_CFLAGS += ${glew_CFLAGS} -ccextractorGUI_LDADD += ${glew_LIBS} -ccextractorGUI_LDFLAGS = -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -ccextractorGUI_LDADD += -lglfw -lm -L/usr/local/lib -lpthread -endif - -if HARDSUBX_IS_ENABLED -if OCR_IS_ENABLED -ccextractorGUI_CFLAGS += -DENABLE_OCR -endif -endif - -EXTRA_DIST += ../icon/ ../fonts/ - -endif - diff --git a/linux/configure.ac b/linux/configure.ac index 1820795b..45fc11f3 100644 --- a/linux/configure.ac +++ b/linux/configure.ac @@ -86,11 +86,6 @@ AC_HELP_STRING([--enable-ffmpeg], [Enable FFmpeg integration]), *) AC_MSG_ERROR([bad value ${enableval} for --enable-ffmpeg]) ;; esac],[ffmpeg=false]) -AC_ARG_WITH([gui], -AC_HELP_STRING([--with-gui], [Builds CCExtractor with GUI (requires GLFW and GLEW)]), -[PKG_CHECK_MODULES([glfw3], [glfw3]) && PKG_CHECK_MODULES([glew], [glew])], -[with_gui=no]) - #Add argument for rust AC_ARG_WITH([rust], AC_HELP_STRING([--with-rust], [Builds CCExtractor with rust library]), @@ -159,7 +154,6 @@ AM_CONDITIONAL(TESSERACT_PRESENT_RPI, [ test -d "/usr/include/tesseract" && test AM_CONDITIONAL(SYS_IS_LINUX, [ test `uname -s` = "Linux"]) AM_CONDITIONAL(SYS_IS_MAC, [ test `uname -s` = "Darwin"]) AM_CONDITIONAL(SYS_IS_APPLE_SILICON, [ test `uname -a | awk '{print $NF}'` = "arm64" ]) -AM_CONDITIONAL(BUILD_WITH_GUI, [test "x$with_gui" = "xyes"]) AM_CONDITIONAL(SYS_IS_64_BIT,[test `getconf LONG_BIT` = "64"]) AC_CONFIG_FILES([Makefile]) diff --git a/mac/Makefile.am b/mac/Makefile.am index b6bcb0ce..27c9de45 100644 --- a/mac/Makefile.am +++ b/mac/Makefile.am @@ -399,63 +399,3 @@ ccextractor_LDADD += $(LEPT_LIB) endif EXTRA_DIST = ../src/thirdparty/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm ../src/thirdparty/utf8proc/utf8proc_data.c fonts/ icon/ - -#For GUI -if BUILD_WITH_GUI -bin_PROGRAMS += ccextractorGUI - -ccextractorGUI_SOURCES = \ - ../src/GUI/ccextractorGUI.c \ - ../src/GUI/ccextractorGUI.h \ - ../src/GUI/activity.c \ - ../src/GUI/activity.h \ - ../src/GUI/terminal.c \ - ../src/GUI/preview.c \ - ../src/GUI/preview.h \ - ../src/GUI/ccx_cli_thread.c \ - ../src/GUI/ccx_cli_thread.h \ - ../src/GUI/command_builder.c \ - ../src/GUI/command_builder.h \ - ../src/GUI/save_load_data.c \ - ../src/GUI/save_load_data.h \ - ../src/GUI/file_browser.c \ - ../src/GUI/file_browser.h \ - ../src/GUI/popups.c \ - ../src/GUI/popups.h \ - ../src/GUI/tabs.c \ - ../src/GUI/tabs.h \ - ../src/GUI/stb_image.h \ - ../src/GUI/nuklear_lib/nuklear.h \ - ../src/GUI/nuklear_lib/nuklear_glfw_gl2.h - -ccextractorGUI_CFLAGS = -std=gnu99 - - -ccextractorGUI_LDADD = ${glfw3_LIBS} - - -if SYS_IS_LINUX -ccextractorGUI_CFLAGS += -s -O3 -DUNIX -ccextractorGUI_CFLAGS += ${glew_CFLAGS} -ccextractorGUI_LDADD += ${glew_LIBS} -ccextractorGUI_LDADD += -lX11 -lXinerama -lXcursor -lXi -lXrandr -lXxf86vm -lm -ldl -lpthread -endif - -if SYS_IS_MAC -ccextractorGUI_CFLAGS += -O3 -DUNIX -ccextractorGUI_CFLAGS += ${glew_CFLAGS} -ccextractorGUI_LDADD += ${glew_LIBS} -ccextractorGUI_LDFLAGS = -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -ccextractorGUI_LDADD += -lglfw -lm -L/usr/local/lib -lpthread -endif - -if HARDSUBX_IS_ENABLED -if OCR_IS_ENABLED -ccextractorGUI_CFLAGS += -DENABLE_OCR -endif -endif - -EXTRA_DIST += ../icon/ ../fonts/ - -endif - diff --git a/mac/configure.ac b/mac/configure.ac index 7cf89f23..53b841d9 100644 --- a/mac/configure.ac +++ b/mac/configure.ac @@ -86,11 +86,6 @@ AS_HELP_STRING([--enable-ffmpeg],[Enable FFmpeg integration]), *) AC_MSG_ERROR([bad value ${enableval} for --enable-ffmpeg]) ;; esac],[ffmpeg=false]) -AC_ARG_WITH([gui], -AS_HELP_STRING([--with-gui],[Builds CCExtractor with GUI (requires GLFW and GLEW)]), -[PKG_CHECK_MODULES([glfw3], [glfw3]) && PKG_CHECK_MODULES([glew], [glew])], -[with_gui=no]) - #Add argument for rust AC_ARG_WITH([rust], AS_HELP_STRING([--with-rust],[Builds CCExtractor with rust library]), @@ -158,7 +153,6 @@ AM_CONDITIONAL(TESSERACT_PRESENT_RPI, [ test -d "/usr/include/tesseract" && test AM_CONDITIONAL(SYS_IS_LINUX, [ test `uname -s` = "Linux"]) AM_CONDITIONAL(SYS_IS_MAC, [ test `uname -s` = "Darwin"]) AM_CONDITIONAL(SYS_IS_APPLE_SILICON, [ test `uname -a | awk '{print $NF}'` = "arm64" ]) -AM_CONDITIONAL(BUILD_WITH_GUI, [test "x$with_gui" = "xyes"]) AM_CONDITIONAL(SYS_IS_64_BIT,[test `getconf LONG_BIT` = "64"]) AC_CONFIG_FILES([Makefile])