From eebfebc3f329b6a351449f99b36327c87a37d8f3 Mon Sep 17 00:00:00 2001 From: abakum Date: Fri, 7 Feb 2020 16:07:37 +0300 Subject: [PATCH 01/10] Create msys2.sh --- msys2.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 msys2.sh diff --git a/msys2.sh b/msys2.sh new file mode 100644 index 0000000..7ed1e9c --- /dev/null +++ b/msys2.sh @@ -0,0 +1,31 @@ +#!/usr/bin/bash + +if [ "$MSYSTEM" == "MSYS" ] ; then + pacman -Syu + pacman -Sy --needed base-devel \ + flex \ + zlib-devel +else + if [ ! -d build ] ; then + pacman -Sy --needed $MINGW_PACKAGE_PREFIX-toolchain \ + $MINGW_PACKAGE_PREFIX-cmake \ + $MINGW_PACKAGE_PREFIX-freetype \ + $MINGW_PACKAGE_PREFIX-zlib \ + $MINGW_PACKAGE_PREFIX-ninja + echo If you intend to build the tsMuxerGUI enter Y + pacman -S --needed $MINGW_PACKAGE_PREFIX-qt5-static + if [ -d $MINGW_PREFIX/qt5-static ] ; then + echo 'load(win32/windows_vulkan_sdk)' > $MINGW_PREFIX/qt5-static/share/qt5/mkspecs/common/windows-vulkan.conf + echo 'QMAKE_LIBS_VULKAN =' >> $MINGW_PREFIX/qt5-static/share/qt5/mkspecs/common/windows-vulkan.conf + fi + mkdir build + fi + cd build + cmake .. -G Ninja + ninja && cp -u tsMuxer/tsmuxer.exe ../bin/ + if [ -d $MINGW_PREFIX/qt5-static ] ; then + $MINGW_PREFIX/qt5-static/bin/qmake ../tsMuxerGUI + make && cp -u debug/tsMuxerGUI.exe ../bin/ + fi + cd .. +fi From 8487deb4b80de1a64c773db92b12d2c94b591675 Mon Sep 17 00:00:00 2001 From: abakum Date: Fri, 7 Feb 2020 16:10:13 +0300 Subject: [PATCH 02/10] Update COMPILING.md --- COMPILING.md | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/COMPILING.md b/COMPILING.md index 33b23c5..8b820a2 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -208,6 +208,11 @@ flex \ zlib-devel ``` +Or just run: +``` +./msys2.sh +``` + Close the Msys2 prompt and then open either a Mingw32 or a Mingw64 prompt, depending on whether you want to build for 32 or 64 bit. ``` pacman -Sy --needed $MINGW_PACKAGE_PREFIX-toolchain \ @@ -216,34 +221,31 @@ $MINGW_PACKAGE_PREFIX-freetype \ $MINGW_PACKAGE_PREFIX-zlib \ $MINGW_PACKAGE_PREFIX-ninja ``` -Browse to the location of the tsMuxer repo and then run: - -``` -./rebuild_linux.sh -``` - -This will create statically compiled versions of tsMuxer - so no external DLL files are required. If you intend to build the GUI as well you need to also install these, depending on your platform (please note Qt5 takes up a LOT of disk space!): - ``` pacman -Sy --needed $MINGW_PACKAGE_PREFIX-qt5-static ``` Before we compile anything we have to alter a file to work around [this bug](https://bugreports.qt.io/browse/QTBUG-76660). Run the following commands to fix that: - ``` echo 'load(win32/windows_vulkan_sdk)' > $MINGW_PREFIX/qt5-static/share/qt5/mkspecs/common/windows-vulkan.conf echo 'QMAKE_LIBS_VULKAN =' >> $MINGW_PREFIX/qt5-static/share/qt5/mkspecs/common/windows-vulkan.conf ``` -With that fixed then run: - +Browse to the location of the tsMuxer repo and then run: ``` -./rebuild_linux_with_gui.sh +./rebuild_linux.sh ``` -This will create statically compiled versions of tsMuxer and tsMuxerGUI - so no external DLL files are required. +This will create in tsMuxer/bin statically compiled versions of tsMuxer - so no external DLL files are required. + +Or just run: +``` +./msys2.sh +``` + +This will create in tsMuxer/bin statically compiled versions of tsMuxer and tsMuxerGUI - so no external DLL files are required. ## MacOS (osxcross on Linux) From d567d7596963b9d7749196808a1a2683d6d82a3f Mon Sep 17 00:00:00 2001 From: abakum Date: Sat, 8 Feb 2020 23:41:06 +0300 Subject: [PATCH 03/10] Update msys2.sh --- msys2.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/msys2.sh b/msys2.sh index 7ed1e9c..2e9a238 100644 --- a/msys2.sh +++ b/msys2.sh @@ -4,7 +4,8 @@ if [ "$MSYSTEM" == "MSYS" ] ; then pacman -Syu pacman -Sy --needed base-devel \ flex \ - zlib-devel + zlib-devel \ + git else if [ ! -d build ] ; then pacman -Sy --needed $MINGW_PACKAGE_PREFIX-toolchain \ @@ -21,6 +22,7 @@ else mkdir build fi cd build + git pull cmake .. -G Ninja ninja && cp -u tsMuxer/tsmuxer.exe ../bin/ if [ -d $MINGW_PREFIX/qt5-static ] ; then From 4057d4e65be431e0940bc1846e54d0cd0602d908 Mon Sep 17 00:00:00 2001 From: abakum Date: Sat, 8 Feb 2020 23:42:27 +0300 Subject: [PATCH 04/10] Update msys2.sh --- msys2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msys2.sh b/msys2.sh index 2e9a238..9da6acb 100644 --- a/msys2.sh +++ b/msys2.sh @@ -21,8 +21,8 @@ else fi mkdir build fi - cd build git pull + cd build cmake .. -G Ninja ninja && cp -u tsMuxer/tsmuxer.exe ../bin/ if [ -d $MINGW_PREFIX/qt5-static ] ; then From 24c8a16c9baad239f3b287e8f38d5b93d61f50cb Mon Sep 17 00:00:00 2001 From: abakum Date: Sat, 8 Feb 2020 23:54:47 +0300 Subject: [PATCH 05/10] Update COMPILING.md --- COMPILING.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/COMPILING.md b/COMPILING.md index 8b820a2..4ff43fc 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -205,7 +205,8 @@ Common: pacman -Syu pacman -Sy --needed base-devel \ flex \ -zlib-devel +zlib-devel \ +git ``` Or just run: @@ -233,7 +234,13 @@ echo 'load(win32/windows_vulkan_sdk)' > $MINGW_PREFIX/qt5-static/share/qt5/mkspe echo 'QMAKE_LIBS_VULKAN =' >> $MINGW_PREFIX/qt5-static/share/qt5/mkspecs/common/windows-vulkan.conf ``` -Browse to the location of the tsMuxer repo and then run: +Download tsMuxer repo and browse to the it location by run: +``` +cd ~ +git clone https://github.com/justdan96/tsMuxer.git +cd tsMuxer +``` +Compile tsMuxer by run: ``` ./rebuild_linux.sh ``` From 09774599481983982d407dc5db4d3c8c0755560e Mon Sep 17 00:00:00 2001 From: abakum Date: Fri, 21 Feb 2020 15:36:11 +0300 Subject: [PATCH 06/10] Rename msys2.sh to rebuild_msys2.sh --- msys2.sh => rebuild_msys2.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename msys2.sh => rebuild_msys2.sh (100%) diff --git a/msys2.sh b/rebuild_msys2.sh similarity index 100% rename from msys2.sh rename to rebuild_msys2.sh From 5884c2c12085dbddf47779086a7bcc947e283d3e Mon Sep 17 00:00:00 2001 From: abakum Date: Fri, 21 Feb 2020 15:39:24 +0300 Subject: [PATCH 07/10] rebuild_msys2.sh --- COMPILING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/COMPILING.md b/COMPILING.md index 4ff43fc..2ddf182 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -211,7 +211,7 @@ git Or just run: ``` -./msys2.sh +./rebuild_msys2.sh ``` Close the Msys2 prompt and then open either a Mingw32 or a Mingw64 prompt, depending on whether you want to build for 32 or 64 bit. @@ -249,7 +249,7 @@ This will create in tsMuxer/bin statically compiled versions of tsMuxer - so no Or just run: ``` -./msys2.sh +./rebuild_msys2.sh ``` This will create in tsMuxer/bin statically compiled versions of tsMuxer and tsMuxerGUI - so no external DLL files are required. From 740c2d4047464741dcb2b58cedf858ffc687fc91 Mon Sep 17 00:00:00 2001 From: abakum Date: Thu, 27 Feb 2020 21:54:49 +0300 Subject: [PATCH 08/10] DTSMUXER_STATIC_BUILD Thanks @ qyot27 for truly static --- rebuild_msys2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebuild_msys2.sh b/rebuild_msys2.sh index 9da6acb..92df11a 100644 --- a/rebuild_msys2.sh +++ b/rebuild_msys2.sh @@ -23,7 +23,7 @@ else fi git pull cd build - cmake .. -G Ninja + cmake ../ -G Ninja -DTSMUXER_STATIC_BUILD=true ninja && cp -u tsMuxer/tsmuxer.exe ../bin/ if [ -d $MINGW_PREFIX/qt5-static ] ; then $MINGW_PREFIX/qt5-static/bin/qmake ../tsMuxerGUI From 5be4e34a417bf1e6d6893b6661469f863715f333 Mon Sep 17 00:00:00 2001 From: abakum Date: Sun, 1 Mar 2020 20:20:01 +0300 Subject: [PATCH 09/10] git clone --- rebuild_msys2.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/rebuild_msys2.sh b/rebuild_msys2.sh index 92df11a..4710d75 100644 --- a/rebuild_msys2.sh +++ b/rebuild_msys2.sh @@ -6,6 +6,9 @@ if [ "$MSYSTEM" == "MSYS" ] ; then flex \ zlib-devel \ git + if [ ! -d tsmuxer ] ; then + git clone https://github.com/justdan96/tsMuxer.git + fi else if [ ! -d build ] ; then pacman -Sy --needed $MINGW_PACKAGE_PREFIX-toolchain \ @@ -13,8 +16,10 @@ else $MINGW_PACKAGE_PREFIX-freetype \ $MINGW_PACKAGE_PREFIX-zlib \ $MINGW_PACKAGE_PREFIX-ninja - echo If you intend to build the tsMuxerGUI enter Y - pacman -S --needed $MINGW_PACKAGE_PREFIX-qt5-static + if [ ! -d $MINGW_PREFIX/qt5-static ] ; then + echo If you intend to build the tsMuxerGUI enter Y + pacman -S --needed $MINGW_PACKAGE_PREFIX-qt5-static + fi if [ -d $MINGW_PREFIX/qt5-static ] ; then echo 'load(win32/windows_vulkan_sdk)' > $MINGW_PREFIX/qt5-static/share/qt5/mkspecs/common/windows-vulkan.conf echo 'QMAKE_LIBS_VULKAN =' >> $MINGW_PREFIX/qt5-static/share/qt5/mkspecs/common/windows-vulkan.conf From d3a973b9ba18a7c2027effabbee8747f5563c842 Mon Sep 17 00:00:00 2001 From: abakum Date: Mon, 2 Mar 2020 11:14:23 +0300 Subject: [PATCH 10/10] no debug --- rebuild_msys2.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rebuild_msys2.sh b/rebuild_msys2.sh index 4710d75..585e93d 100644 --- a/rebuild_msys2.sh +++ b/rebuild_msys2.sh @@ -1,5 +1,6 @@ #!/usr/bin/bash +cd ~ if [ "$MSYSTEM" == "MSYS" ] ; then pacman -Syu pacman -Sy --needed base-devel \ @@ -10,6 +11,7 @@ if [ "$MSYSTEM" == "MSYS" ] ; then git clone https://github.com/justdan96/tsMuxer.git fi else + cd tsmuxer if [ ! -d build ] ; then pacman -Sy --needed $MINGW_PACKAGE_PREFIX-toolchain \ $MINGW_PACKAGE_PREFIX-cmake \ @@ -32,7 +34,7 @@ else ninja && cp -u tsMuxer/tsmuxer.exe ../bin/ if [ -d $MINGW_PREFIX/qt5-static ] ; then $MINGW_PREFIX/qt5-static/bin/qmake ../tsMuxerGUI - make && cp -u debug/tsMuxerGUI.exe ../bin/ + make && cp -u tsMuxerGUI.exe ../bin/ fi cd .. fi