rpm/aegisub
SHA256
1
0
Fork 0
forked from pool/aegisub
Code Pull Requests Activity

Accepting request 481682 from multimedia:apps

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/481682
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aegisub?expand=0&rev=22
This commit is contained in:
Dominique Leuenberger 2017-03-24 01:22:05 +00:00 committed by Git OBS Bridge
commit 3b0d8cd935
3 changed files with 94 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
aegisub.build-compare.patch Normal file
View File

@ -0,0 +1,87 @@
--- a/libaegisub/Makefile
+++ b/libaegisub/Makefile
@@ -4,12 +4,12 @@ aegisub_OBJ := \
$(d)common/parser.o \
$(d)ass/dialogue_parser.o \
$(d)ass/time.o \
- $(subst .cpp,.o,$(wildcard $(d)audio/*.cpp)) \
- $(subst .cpp,.o,$(wildcard $(d)common/cajun/*.cpp)) \
- $(subst .cpp,.o,$(wildcard $(d)lua/modules/*.cpp)) \
- $(subst .c,.o,$(wildcard $(d)lua/modules/*.c)) \
- $(subst .cpp,.o,$(wildcard $(d)lua/*.cpp)) \
- $(subst .cpp,.o,$(wildcard $(d)unix/*.cpp)) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)audio/*.cpp))) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)common/cajun/*.cpp))) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)lua/modules/*.cpp))) \
+ $(subst .c,.o,$(sort $(wildcard $(d)lua/modules/*.c))) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)lua/*.cpp))) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)unix/*.cpp))) \
$(d)common/calltip_provider.o \
$(d)common/character_count.o \
$(d)common/charset.o \
@@ -35,7 +35,7 @@ aegisub_OBJ := \
$(d)common/ycbcr_conv.o
ifeq (yes, $(BUILD_DARWIN))
-aegisub_OBJ += $(subst .mm,.o,$(wildcard $(d)osx/*.mm))
+aegisub_OBJ += $(subst .mm,.o,$(sort $(wildcard $(d)osx/*.mm)))
else
aegisub_OBJ += $(d)common/dispatch.o
endif
--- a/packages/desktop/Makefile
+++ b/packages/desktop/Makefile
@@ -1,7 +1,7 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../header.mk
DESKTOP_SRC := $(d)
-ICONS = $(wildcard $(d)*.png) $(wildcard $(d)*.svg)
+ICONS = $(sort $(wildcard $(d)*.png)) $(sort $(wildcard $(d)*.svg))
ICONS_INSTALLED = $(DESTDIR)$(P_ICON)/hicolor/%/apps/aegisub.
DESKTOP_FILE := $(d)aegisub.desktop
--- a/src/Makefile
+++ b/src/Makefile
@@ -11,10 +11,10 @@ src_PCH := $(d)agi_pre.h
src_INSTALLNAME := $(AEGISUB_COMMAND)
src_OBJ := \
- $(subst .cpp,.o,$(wildcard $(d)command/*.cpp)) \
- $(subst .cpp,.o,$(wildcard $(d)dialog_*.cpp)) \
- $(subst .cpp,.o,$(wildcard $(d)subtitle_format*.cpp)) \
- $(subst .cpp,.o,$(wildcard $(d)visual_tool*.cpp)) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)command/*.cpp))) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)dialog_*.cpp))) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)subtitle_format*.cpp))) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)visual_tool*.cpp))) \
$(d)MatroskaParser.o \
$(d)aegisublocale.o \
$(d)ass_attachment.o \
@@ -119,7 +119,7 @@ src_OBJ := \
$(TOP)lib/libuniversalchardet.a \
ifeq (yes, $(BUILD_DARWIN))
-src_OBJ += $(subst .mm,.o,$(wildcard $(d)osx/*.mm))
+src_OBJ += $(subst .mm,.o,$(sort $(wildcard $(d)osx/*.mm)))
endif
###############
--- a/vendor/luabins/Makefile
+++ b/vendor/luabins/Makefile
@@ -1,6 +1,6 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../header.mk
-luabins_OBJ := $(subst .c,.o,$(wildcard $(d)src/*.c))
+luabins_OBJ := $(subst .c,.o,$(sort $(wildcard $(d)src/*.c)))
luabins_CPPFLAGS := $(CFLAGS_LUA)
LIB += luabins
--- a/vendor/universalchardet/Makefile
+++ b/vendor/universalchardet/Makefile
@@ -1,6 +1,6 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../header.mk
-universalchardet_OBJ := $(subst .cpp,.o,$(wildcard $(d)*.cpp))
+universalchardet_OBJ := $(subst .cpp,.o,$(sort $(wildcard $(d)*.cpp)))
universalchardet_CPPFLAGS := -D_X86_
LIB += universalchardet

5
aegisub.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 21 07:10:37 UTC 2017 - olaf@aepfle.de
- Sort list of sources with aegisub.build-compare.patch
-------------------------------------------------------------------
Tue Feb 21 08:20:44 UTC 2017 - olaf@aepfle.de

2
aegisub.spec
View File

@ -26,6 +26,7 @@ License: BSD-3-Clause
Group: Productivity/Multimedia/Video/Editors and Convertors
Url: http://www.aegisub.net/
Source0: http://ftp.aegisub.org/pub/releases/aegisub-%{version}.tar.xz
Patch0: aegisub.build-compare.patch
Patch1: Makefile.inc.in.patch
BuildRequires: autoconf
BuildRequires: automake
@ -66,6 +67,7 @@ functions with ease.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/version.cpp