Request 1616 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 1616 (accepted)

Update to 0.8.2 release.

Created by boombatower over 9 years ago
In state accepted
Package maintainers: boombatower and frispete

Submit obs-studio-update

Submit package home:boomb...Multimedia / obs-studio-update to package Multimedia / obs-studio

obs-studio.changes Changed

obs-studio.spec Changed

obs-studio-allow-OBS_VERSION-to-be-set.patch Deleted

@@ -1,45 +0,0 @@
-From 0245e3b43ed3c48871522cd7720b78673415ddb8 Mon Sep 17 00:00:00 2001
-From: Jimmy Berry <jimmy@boombatower.com>
-Date: Fri, 30 Jan 2015 14:04:54 -0600
-Subject: [PATCH] Allow OBS_VERSION to be set to assist in packaging.
-
----
- cmake/Modules/ObsCpack.cmake | 20 +++++++++++++-------
- 1 file changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/cmake/Modules/ObsCpack.cmake b/cmake/Modules/ObsCpack.cmake
-index cb5e85a..6de6019 100644
---- a/cmake/Modules/ObsCpack.cmake
-+++ b/cmake/Modules/ObsCpack.cmake
-@@ -14,15 +14,21 @@ set(CPACK_PACKAGE_VERSION_MINOR "0")
- set(CPACK_PACKAGE_VERSION_PATCH "1")
- set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
- 
--if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
--	execute_process(COMMAND git describe --always --tags --dirty=-modified
--		OUTPUT_VARIABLE OBS_VERSION
--		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
--		OUTPUT_STRIP_TRAILING_WHITESPACE)
--else()
--	set(OBS_VERSION "${CPACK_PACKAGE_VERSION}")
-+if(NOT DEFINED OBS_VERSION)
-+	if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
-+		execute_process(COMMAND git describe --always --tags --dirty=-modified
-+			OUTPUT_VARIABLE OBS_VERSION
-+			WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-+			OUTPUT_STRIP_TRAILING_WHITESPACE)
-+	endif()
-+
-+	# Fallback to static version when git is either not available or fails.
-+	if("${OBS_VERSION}" STREQUAL "")
-+		set(OBS_VERSION "${CPACK_PACKAGE_VERSION}")
-+	endif()
- endif()
- 
-+MESSAGE(STATUS "OBS_VERSION: ${OBS_VERSION}")
- 
- if(INSTALLER_RUN)
- 	set(CPACK_PACKAGE_EXECUTABLES
--- 
-2.1.4
-

_service Changed

obs-studio-0.7.3+git20150114.d54b3cc.tar.xz -> obs-studio-0.8.2+git20150211.6099c65.tar.xz Changed

Build Results
RPM Lint

Refresh

Comments for request 1616 0

Request History

boombatower created request over 9 years ago

Update to 0.8.2 release.

boombatower accepted request over 9 years ago