summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Suchan2023-01-20 08:59:18 +0100
committerRoland Suchan2023-01-20 08:59:18 +0100
commitca2bc5ed9506a2e727b3e96b0a1eb943ad63a393 (patch)
tree6ae9720973ce3080b20a17b9a9ac254aae8178a5
parent03dfcd1e46dcb1c19ad5e16bad5e17e7d2560ab4 (diff)
downloadaur-ca2bc5ed9506a2e727b3e96b0a1eb943ad63a393.tar.gz
version 2.3.1-13
-rw-r--r--.SRCINFO4
-rw-r--r--CMakeLists.patch45
-rw-r--r--CMakeLists_qrender.patch26
-rw-r--r--PKGBUILD14
4 files changed, 85 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6b7f2c7282d8..df34a2fe54b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,7 +17,7 @@ pkgbase = qdvdauthor
provides = dvd-slideshow
provides = qrender
provides = qplayer
- source = https://sourceforge.net/projects/qdvd/files/archlinux/qdvdauthor-2.3.1-013a.tar.gz
- md5sums = 47cc4cc2ba33d8058f7978b9ba89f127
+ source = https://sourceforge.net/projects/qdvd/files/qdvd-2.3.1-qt5/qdvdauthor-2.3.1-013.tar.gz
+ md5sums = c678e035b7547f02ed9eca9c78b38769
pkgname = qdvdauthor
diff --git a/CMakeLists.patch b/CMakeLists.patch
new file mode 100644
index 000000000000..7feb8b5e22a2
--- /dev/null
+++ b/CMakeLists.patch
@@ -0,0 +1,45 @@
+diff -upr ffDiaporama.r0/src/qdvdauthor-2.3.1/CMakeLists.txt ffDiaporama.r1/src/qdvdauthor-2.3.1/CMakeLists.txt
+--- qdvdauthor.r0/CMakeLists.txt 2021-08-03 11:23:22.000000000 +0200
++++ qdvdauthor.r1/CMakeLists.txt 2023-01-19 19:18:03.189089001 +0100
+@@ -262,20 +262,20 @@
+ #${FFMPEG_AVCODEC_INCLUDE_DIR}
+ #${FFMPEG_AVFORMAT_INCLUDE_DIR}
+ #${FFMPEG_SWSCALE_INCLUDE_DIR}
+- ${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/include
++ #${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/include
+ #/usr/local/include
+ #/usr/local/include/ffmpeg063
+- #/usr/include/ffmpeg063
++ /opt/ffmpeg063/include
+ )
+ set(FFMPEG_LIBRARIES
+ #${FFMPEG_AVCODEC_LIBRARY}
+ #${FFMPEG_AVFORMAT_LIBRARY}
+ #${FFMPEG_AVUTIL_LIBRARY}
+ #${FFMPEG_SWSCALE_LIBRARY}
+- ${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libavcodec.so
+- ${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libavformat.so
+- ${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libavutil.so
+- ${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libswscale.so
++ #${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libavcodec.so
++ #${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libavformat.so
++ #${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libavutil.so
++ #${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libswscale.so
+ #/usr/local/lib64/libavcodec.so
+ #/usr/local/lib64/libavformat.so
+ #/usr/local/lib64/libavutil.so
+@@ -284,10 +284,10 @@
+ #/usr/lib/libavformat.so
+ #/usr/lib/libavutil.so
+ #/usr/lib/libswscale.so
+- #/usr/local/lib/libavcodec.so
+- #/usr/local/lib/libavformat.so
+- #/usr/local/lib/libavutil.so
+- #/usr/local/lib/libswscale.so
++ /opt/ffmpeg063/lib/libavcodec.so
++ /opt/ffmpeg063/lib/libavformat.so
++ /opt/ffmpeg063/lib/libavutil.so
++ /opt/ffmpeg063/lib/libswscale.so
+ )
+ #endif (FFMPEG_FOUND)
+
diff --git a/CMakeLists_qrender.patch b/CMakeLists_qrender.patch
new file mode 100644
index 000000000000..f4088c1a2954
--- /dev/null
+++ b/CMakeLists_qrender.patch
@@ -0,0 +1,26 @@
+diff -upr ffDiaporama.r0/src/qdvdauthor-2.3.1/qrender/ffmpeg-0.6.3/CMakeLists.txt ffDiaporama.r1/src/qdvdauthor-2.3.1/qrender/ffmpeg-0.6.3/CMakeLists.txt
+--- qdvdauthor.r0/qrender/ffmpeg-0.6.3/CMakeLists.txt 2017-11-25 08:36:00.000000000 +0100
++++ qdvdauthor.r1/qrender/ffmpeg-0.6.3/CMakeLists.txt 2023-01-19 19:19:07.385087235 +0100
+@@ -1,12 +1,12 @@
+ ########### install files ###############
+
+-INSTALL(FILES lib/libavcodec.so.52 DESTINATION lib64/)
+-INSTALL(FILES lib/libavcodec.so.52.72.2 DESTINATION lib64/)
+-INSTALL(FILES lib/libavdevice.so.52 DESTINATION lib64/)
+-INSTALL(FILES lib/libavdevice.so.52.2.0 DESTINATION lib64/)
+-INSTALL(FILES lib/libavformat.so.52 DESTINATION lib64/)
+-INSTALL(FILES lib/libavformat.so.52.64.2 DESTINATION lib64/)
+-INSTALL(FILES lib/libavutil.so.50 DESTINATION lib64/)
+-INSTALL(FILES lib/libavutil.so.50.15.1 DESTINATION lib64/)
+-INSTALL(FILES lib/libswscale.so.0 DESTINATION lib64/)
+-INSTALL(FILES lib/libswscale.so.0.11.0 DESTINATION lib64/)
++#INSTALL(FILES lib/libavcodec.so.52 DESTINATION lib64/)
++#INSTALL(FILES lib/libavcodec.so.52.72.2 DESTINATION lib64/)
++#INSTALL(FILES lib/libavdevice.so.52 DESTINATION lib64/)
++#INSTALL(FILES lib/libavdevice.so.52.2.0 DESTINATION lib64/)
++#INSTALL(FILES lib/libavformat.so.52 DESTINATION lib64/)
++#INSTALL(FILES lib/libavformat.so.52.64.2 DESTINATION lib64/)
++#INSTALL(FILES lib/libavutil.so.50 DESTINATION lib64/)
++#INSTALL(FILES lib/libavutil.so.50.15.1 DESTINATION lib64/)
++#INSTALL(FILES lib/libswscale.so.0 DESTINATION lib64/)
++#INSTALL(FILES lib/libswscale.so.0.11.0 DESTINATION lib64/)
diff --git a/PKGBUILD b/PKGBUILD
index eedad15b807f..aff08bbbee18 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,8 +18,18 @@ provides=(
'qrender'
)
options=()
-source=("https://sourceforge.net/projects/qdvd/files/archlinux/qdvdauthor-${pkgver}-013a.tar.gz")
-md5sums=('47cc4cc2ba33d8058f7978b9ba89f127')
+source=("https://sourceforge.net/projects/qdvd/files/qdvd-2.3.1-qt5/qdvdauthor-${pkgver}-013.tar.gz"
+ 'CMakeLists.patch'
+ 'CMakeLists_qrender.patch')
+md5sums=('c678e035b7547f02ed9eca9c78b38769'
+ 'c9c7641aff17d1f9a299f4ea4fa03c6b'
+ '612adb519f1dc94a403740e9c08a9afe')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch --forward --strip=1 --input="${srcdir}/CMakeLists.patch"
+ patch --forward --strip=1 --input="${srcdir}/CMakeLists_qrender.patch"
+}
build() {
cd qdvdauthor-${pkgver}/build