From 33d95a8a4e23d8cb70305c0006eebd010e02a4df Mon Sep 17 00:00:00 2001 From: Mushfiqur Rahman Abir <28858998+Abir-Tx@users.noreply.github.com> Date: Fri, 14 May 2021 01:54:10 +0600 Subject: [PATCH 1/7] Add needed files for aur pakcage --- CMakeLists.txt | 1 + PKGBUILD | 31 +++++++++++++++++-------------- ffmpeg-coder/DEBIAN/changelog | 13 ------------- ffmpeg-coder/DEBIAN/control | 19 ------------------- 4 files changed, 18 insertions(+), 46 deletions(-) delete mode 100644 ffmpeg-coder/DEBIAN/changelog delete mode 100644 ffmpeg-coder/DEBIAN/control diff --git a/CMakeLists.txt b/CMakeLists.txt index b3a54bd..fcbc571 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,7 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) file(GLOB SOURCES "src/*.cpp") add_executable(ffmpeg-coder ${SOURCES}) +install(TARGETS ffmpeg-coder DESTINATION bin) # add_executable(ffmpeg-coder src/ffmpeg-coder.cpp src/test.cpp) diff --git a/PKGBUILD b/PKGBUILD index 6642ee5..50b41e9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,8 +15,7 @@ license=('MIT') groups=() depends=() makedepends=(git make gcc) -checkdepends=() -optdepends=() +optdepends=(ffmpeg) provides=(ffmpeg-coder) conflicts=(ffmpeg-coder) replaces=() @@ -26,20 +25,24 @@ install= changelog= source=("git+$url") noextract=() -md5sums=(f8b683e201b3e9b1f003fef349f4a971) +md5sums=('SKIP') validpgpkeys=() -prepare() { - cd "$pkgname" - make -f Makefile.own dir -} - -build() { - cd "$pkgname" - make -f Makefile.own build -} - +# prepare() { +# cd "$pkgname" +# make -f Makefile.own dir +# } +# +# build() { +# cd "$pkgname" +# make -f Makefile.own build +# } +# package() { cd "$pkgname" - cp bin/ffmpeg-coder.o /bin + git switch aur + mkdir build && cd build + cmake .. + make install + # install -Dm644 docs/README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md" } diff --git a/ffmpeg-coder/DEBIAN/changelog b/ffmpeg-coder/DEBIAN/changelog deleted file mode 100644 index 158ae3d..0000000 --- a/ffmpeg-coder/DEBIAN/changelog +++ /dev/null @@ -1,13 +0,0 @@ -ffmpeg-coder (1.9.0) unstable: urgency=low - -* New quick convert menu entry -* New quick convert settings added -* Bug fixes -* Upgrade the source code base - -ffmpeg-coder (1.0) stable: urgency=low - -* Initial release. - --- Mushfiqur Rahman Abir Tue, 17 Feb 2021 00:30:21 +0600 - diff --git a/ffmpeg-coder/DEBIAN/control b/ffmpeg-coder/DEBIAN/control deleted file mode 100644 index 14adb84..0000000 --- a/ffmpeg-coder/DEBIAN/control +++ /dev/null @@ -1,19 +0,0 @@ -Source: ffmpeg-coder -Section: misc -Priority: optional -Maintainer: abir-tx -Build-Depends: g++, make -Standard-Version: 1.0.0 -Homepage: http://www.github.com/abir-tx/ffmpeg-coder -Package: ffmpeg-coder -Version: 1.9.0 -Architecture: all -Essential: no -Size: 20 -Installed-Size: 80 -Description: A small cross platform CLI tool which will help in producing different types video converting codes quickly for new ffmpeg CLI users. - # FFMPEG-Coder - A small cross platform CLI tool which will help in producing different types video converting codes quickly for new ffmpeg CLI users. The tool will make it easy to generate ffmpeg commands for them. If you don't use or know about **FFMPEG** then this tool might not be for you. - # Who is this tool for ? - This tool is created for those who find it difficult to understand or find the appropriate commands for converting a video as they want using the FFMPEG CLI tool. - Also those who are new to Command Lines they can also use this tool to generate ffmpeg commands very easily. Many new ffmpeg users find it difficult to find the appropriate ffmpeg commands to convert their videos to with their desired configs. So, as a result they end up googling a lot and wasting their time. So this tool is for them. From 2bd7d8fa619f2c16162c05a8fa8109bcb7363e6b Mon Sep 17 00:00:00 2001 From: Mushfiqur Rahman Abir <28858998+Abir-Tx@users.noreply.github.com> Date: Fri, 14 May 2021 02:10:24 +0600 Subject: [PATCH 2/7] Finalize with working pkgbuild --- PKGBUILD | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 50b41e9..4adca7f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -28,21 +28,23 @@ noextract=() md5sums=('SKIP') validpgpkeys=() -# prepare() { -# cd "$pkgname" -# make -f Makefile.own dir -# } -# -# build() { -# cd "$pkgname" -# make -f Makefile.own build -# } -# -package() { +prepare() { cd "$pkgname" git switch aur mkdir build && cd build cmake .. - make install - # install -Dm644 docs/README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md" +} + +build() { + cd "$pkgname" + cd build + make +} + +package() { + cd "$pkgname" + cd build + sudo make install + cd .. + install -Dm644 docs/README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md" } From 8b7b5e51e3f6245c39c84822a1816d68d9733281 Mon Sep 17 00:00:00 2001 From: Mushfiqur Rahman Abir <28858998+Abir-Tx@users.noreply.github.com> Date: Fri, 14 May 2021 02:30:32 +0600 Subject: [PATCH 3/7] Update pkgbuild script and create srcinfo Why: How: What: Tags: --- .SRCINFO | 19 +++++++++++++++++++ .gitignore | 8 ++++++++ Makefile.own | 10 ++++++++-- PKGBUILD | 2 ++ 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 .SRCINFO diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..666d500 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,19 @@ +pkgbase = ffmpeg-coder + pkgdesc = A small cross platform CLI tool which will help in producing different types video converting codes quickly for new ffmpeg CLI users + pkgver = 2.0.0 + pkgrel = 1 + url = https://github.com/Abir-Tx/ffmpeg-coder.git + arch = x86_64 + arch = i686 + license = MIT + makedepends = git + makedepends = make + makedepends = gcc + optdepends = ffmpeg + provides = ffmpeg-coder + conflicts = ffmpeg-coder + source = git+https://github.com/Abir-Tx/ffmpeg-coder.git + md5sums = SKIP + +pkgname = ffmpeg-coder + diff --git a/.gitignore b/.gitignore index 0a9749d..fcbe529 100755 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,11 @@ build/* ### CMake Patch ### # External projects *-prefix/ + +# PKGBUILD + +*pkg.tar.zst +pkg/* +src/ffmpeg-coder +src/ffmpeg-coder/* +ffmpeg-coder/* diff --git a/Makefile.own b/Makefile.own index 2a6768c..590b007 100644 --- a/Makefile.own +++ b/Makefile.own @@ -43,7 +43,13 @@ debpackage: build cp bin/ffmpeg-coder ffmpeg-coder/usr/bin/ fakeroot dpkg-deb -v --build ffmpeg-coder bin echo The deb package has been created in the bin folder - + + +pkgclean: + sudo rm -r ffmpeg-coder pkg src/ffmpeg-coder *pkg.tar.zst + +pkgbuild: + makepkg # Windows Configs for make .PHONY: winbuild @@ -58,4 +64,4 @@ winrun: .PHONY: winProductionBuild winProductionBuild: echo Building release version..... - ${CC} ${CFLAG} src\ffmpeg-coder.cpp src\frontend_funcs.cpp src\main.cpp src\quickConvertSettings.cpp src\utils.cpp ${INC} -static-libgcc -static-libstdc++ -o ${BUILDDIR}/${APPNAME}.exe \ No newline at end of file + ${CC} ${CFLAG} src\ffmpeg-coder.cpp src\frontend_funcs.cpp src\main.cpp src\quickConvertSettings.cpp src\utils.cpp ${INC} -static-libgcc -static-libstdc++ -o ${BUILDDIR}/${APPNAME}.exe diff --git a/PKGBUILD b/PKGBUILD index 4adca7f..2fbb0b2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -47,4 +47,6 @@ package() { sudo make install cd .. install -Dm644 docs/README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + } From f46df1e48c8a8ed7a1aca55fd73ed9686588b025 Mon Sep 17 00:00:00 2001 From: Mushfiqur Rahman Abir <28858998+Abir-Tx@users.noreply.github.com> Date: Fri, 14 May 2021 02:50:58 +0600 Subject: [PATCH 4/7] Add SRC generation command Why: How: What: Tags: --- Makefile.own | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.own b/Makefile.own index 590b007..73734bd 100644 --- a/Makefile.own +++ b/Makefile.own @@ -50,6 +50,7 @@ pkgclean: pkgbuild: makepkg + makepkg --printsrcinfo > .SRCINFO # Windows Configs for make .PHONY: winbuild From 58b2197949ea9d44ff744f75407f2282cde6f90e Mon Sep 17 00:00:00 2001 From: Mushfiqur Rahman Abir <28858998+Abir-Tx@users.noreply.github.com> Date: Fri, 14 May 2021 03:04:24 +0600 Subject: [PATCH 5/7] Update & fix the branch name --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 2fbb0b2..a6fca45 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -30,7 +30,7 @@ validpgpkeys=() prepare() { cd "$pkgname" - git switch aur + git switch pkgbuild mkdir build && cd build cmake .. } From 7c55b4b8272961f81614f12cfe95f1b7dfcc6ffe Mon Sep 17 00:00:00 2001 From: Mushfiqur Rahman Abir <28858998+Abir-Tx@users.noreply.github.com> Date: Fri, 14 May 2021 03:10:12 +0600 Subject: [PATCH 6/7] Bump up pkgrel --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index a6fca45..dd63202 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # Maintainer: Abir-Tx pkgname=ffmpeg-coder pkgver=2.0.0 -pkgrel=1 +pkgrel=1.1 epoch= pkgdesc="A small cross platform CLI tool which will help in producing different types video converting codes quickly for new ffmpeg CLI users" arch=(x86_64 i686) From 8e8054962542d08ca0e2ab36079fb10d4b370c06 Mon Sep 17 00:00:00 2001 From: Mushfiqur Rahman Abir <28858998+Abir-Tx@users.noreply.github.com> Date: Fri, 14 May 2021 03:11:44 +0600 Subject: [PATCH 7/7] Regenerate srcinfo file --- .SRCINFO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 666d500..ff7f901 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = ffmpeg-coder pkgdesc = A small cross platform CLI tool which will help in producing different types video converting codes quickly for new ffmpeg CLI users pkgver = 2.0.0 - pkgrel = 1 + pkgrel = 1.1 url = https://github.com/Abir-Tx/ffmpeg-coder.git arch = x86_64 arch = i686