diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2021-01-20 23:15:33 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2021-01-20 23:43:57 +0100 |
| commit | ddd8ed67486813359c8ae4a357863f66d6156be4 (patch) | |
| tree | fdaa88d3ac81cc7ce1918df6b4cb907aa996a389 /packaging | |
| parent | a6eab5d9502c87e09f6f1c4aa41ba821ae4eb3db (diff) | |
Enable m4a encoding for PPA builds
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/CPackDebUploadPPA.cmake | 28 | ||||
| -rw-r--r-- | packaging/debian/control.in | 1 |
2 files changed, 18 insertions, 11 deletions
diff --git a/packaging/CPackDebUploadPPA.cmake b/packaging/CPackDebUploadPPA.cmake index 7de7ff7f7e..3263e4e03c 100644 --- a/packaging/CPackDebUploadPPA.cmake +++ b/packaging/CPackDebUploadPPA.cmake @@ -50,6 +50,7 @@ execute_process( message( NOTICE "Creating debian folder" ) file(COPY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/packaging/debian DESTINATION ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}) +file(REMOVE ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian/control.in) execute_process( COMMAND ${CPACK_DEBIAN_MARKDOWN} ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/CHANGELOG.md @@ -57,11 +58,6 @@ execute_process( WORKING_DIRECTORY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian ) -configure_file(${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian/control.in - ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian/control - @ONLY) -file(REMOVE ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian/control.in) - file(COPY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/res/linux/mixxx-usb-uaccess.rules DESTINATION ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian) file(RENAME @@ -78,12 +74,22 @@ endif() foreach(RELEASE ${CPACK_DEBIAN_DISTRIBUTION_RELEASES}) - file(COPY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/packaging/debian/changelog - DESTINATION ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian) - execute_process(COMMAND ${CPACK_DEBIAN_DEBCHANGE} -v "${CPACK_DEBIAN_UPSTREAM_VERSION}-${CPACK_DEBIAN_DEBIAN_VERSION}~${CPACK_DEBIAN_DEBIAN_VERSION_EXTRA}~${RELEASE}" -M "Build of ${CPACK_DEBIAN_UPSTREAM_VERSION}" - WORKING_DIRECTORY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}) - execute_process(COMMAND ${CPACK_DEBIAN_DEBCHANGE} -r -D ${RELEASE} -M "Build of ${CPACK_DEBIAN_UPSTREAM_VERSION}" - WORKING_DIRECTORY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}) + if (RELEASE STREQUAL "bionic") + set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libmp4v2-dev,") + else() + set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libavcodec-dev, libavutil-dev,") + endif() + + configure_file(${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/packaging/debian/control.in + ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian/control + @ONLY) + + file(COPY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/packaging/debian/changelog + DESTINATION ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian) + execute_process(COMMAND ${CPACK_DEBIAN_DEBCHANGE} -v "${CPACK_DEBIAN_UPSTREAM_VERSION}-${CPACK_DEBIAN_DEBIAN_VERSION}~${CPACK_DEBIAN_DEBIAN_VERSION_EXTRA}~${RELEASE}" -M "Build of ${CPACK_DEBIAN_UPSTREAM_VERSION}" + WORKING_DIRECTORY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}) + execute_process(COMMAND ${CPACK_DEBIAN_DEBCHANGE} -r -D ${RELEASE} -M "Build of ${CPACK_DEBIAN_UPSTREAM_VERSION}" + WORKING_DIRECTORY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}) if (BUILD_MACHINE_RELEASE STREQUAL RELEASE AND DEB_BUILD) set(CPACK_DEBIAN_DEBUILD_BUILD "-b") diff --git a/packaging/debian/control.in b/packaging/debian/control.in index f7435fd4bc..85fcd77f82 100644 --- a/packaging/debian/control.in +++ b/packaging/debian/control.in @@ -3,6 +3,7 @@ Section: @CPACK_DEBIAN_PACKAGE_SECTION@ Priority: @CPACK_DEBIAN_PACKAGE_PRIORITY@ Maintainer: @CPACK_PACKAGE_CONTACT@ Build-Depends: debhelper (>= 11), + @CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA@ pkg-config, docbook-to-man, markdown, |