rpm/aegisub
SHA256
1
0
Fork 0
forked from pool/aegisub
Code Pull Requests Activity
bae05bcc82
aegisub/remove-vendor-luajit-dependency.patch

82 lines
3.7 KiB
Diff
Raw Normal View History

- Add constraints file to allow paralel build - Add changelog to files list to ensure plain rpmbuild to work - Do not bundle luajit remove-vendor-luajit-dependency.patch - Disable the version checking, calling home in desktop apps is really bad idea, esp since upstream is semi-dead - Add patch to fix build with icu59 icu59.patch - Add patch to not put O3 to the cflags aegisub-no-optimize.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=39
2017-06-05 10:22:09 +02:00
Subject: vendor/luajit is removed in the Debian package
Author: Sebastian Reichel <sre@debian.org>
Forwarded: not-needed
Last-Update: 2014-08-06
Accepting request 689868 from home:plater Fix boo#1130889 by fixing aegisub's build against boost 1.69 with aegisub-boost169.patch, reported upstream with patch in issue: https://github.com/Aegisub/Aegisub/issues/93 OBS-URL: https://build.opensuse.org/request/show/689868 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=57
2019-03-29 14:34:01 +01:00
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/header.mk
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
===================================================================
Accepting request 689868 from home:plater Fix boo#1130889 by fixing aegisub's build against boost 1.69 with aegisub-boost169.patch, reported upstream with patch in issue: https://github.com/Aegisub/Aegisub/issues/93 OBS-URL: https://build.opensuse.org/request/show/689868 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=57
2019-03-29 14:34:01 +01:00
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/header.mk 2018-07-10 00:06:51.000000000 +0200
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/header.mk 2019-03-29 13:17:35.252933339 +0200
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
@@ -13,7 +13,6 @@ subdirs := \
- Add constraints file to allow paralel build - Add changelog to files list to ensure plain rpmbuild to work - Do not bundle luajit remove-vendor-luajit-dependency.patch - Disable the version checking, calling home in desktop apps is really bad idea, esp since upstream is semi-dead - Add patch to fix build with icu59 icu59.patch - Add patch to not put O3 to the cflags aegisub-no-optimize.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=39
2017-06-05 10:22:09 +02:00
tests \
tools \
vendor/luabins \
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
- vendor/luajit
- Add constraints file to allow paralel build - Add changelog to files list to ensure plain rpmbuild to work - Do not bundle luajit remove-vendor-luajit-dependency.patch - Disable the version checking, calling home in desktop apps is really bad idea, esp since upstream is semi-dead - Add patch to fix build with icu59 icu59.patch - Add patch to not put O3 to the cflags aegisub-no-optimize.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=39
2017-06-05 10:22:09 +02:00
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
Accepting request 689868 from home:plater Fix boo#1130889 by fixing aegisub's build against boost 1.69 with aegisub-boost169.patch, reported upstream with patch in issue: https://github.com/Aegisub/Aegisub/issues/93 OBS-URL: https://build.opensuse.org/request/show/689868 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=57
2019-03-29 14:34:01 +01:00
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
===================================================================
Accepting request 689868 from home:plater Fix boo#1130889 by fixing aegisub's build against boost 1.69 with aegisub-boost169.patch, reported upstream with patch in issue: https://github.com/Aegisub/Aegisub/issues/93 OBS-URL: https://build.opensuse.org/request/show/689868 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=57
2019-03-29 14:34:01 +01:00
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/Makefile.inc.in 2019-03-29 13:17:21.692386078 +0200
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in 2019-03-29 13:17:35.252933339 +0200
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
@@ -79,7 +79,7 @@ CFLAGS_ICONV = @ICONV_CFLAGS@
- Add constraints file to allow paralel build - Add changelog to files list to ensure plain rpmbuild to work - Do not bundle luajit remove-vendor-luajit-dependency.patch - Disable the version checking, calling home in desktop apps is really bad idea, esp since upstream is semi-dead - Add patch to fix build with icu59 icu59.patch - Add patch to not put O3 to the cflags aegisub-no-optimize.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=39
2017-06-05 10:22:09 +02:00
CFLAGS_ICU = @ICU_I18N_CFLAGS@
CFLAGS_LIBASS = @LIBASS_CFLAGS@
CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
-CFLAGS_LUA = @LUAJIT_CFLAGS@
- Add constraints file to allow paralel build - Add changelog to files list to ensure plain rpmbuild to work - Do not bundle luajit remove-vendor-luajit-dependency.patch - Disable the version checking, calling home in desktop apps is really bad idea, esp since upstream is semi-dead - Add patch to fix build with icu59 icu59.patch - Add patch to not put O3 to the cflags aegisub-no-optimize.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=39
2017-06-05 10:22:09 +02:00
+CFLAGS_LUA = `pkg-config --cflags luajit`
CFLAGS_OPENAL = @OPENAL_CFLAGS@
CFLAGS_OSS = @OSS_CFLAGS@
CFLAGS_PORTAUDIO = @PORTAUDIO_CFLAGS@
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
@@ -97,14 +97,14 @@ LIBS_ICONV = @ICONV_LIBS@
- Add constraints file to allow paralel build - Add changelog to files list to ensure plain rpmbuild to work - Do not bundle luajit remove-vendor-luajit-dependency.patch - Disable the version checking, calling home in desktop apps is really bad idea, esp since upstream is semi-dead - Add patch to fix build with icu59 icu59.patch - Add patch to not put O3 to the cflags aegisub-no-optimize.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=39
2017-06-05 10:22:09 +02:00
LIBS_ICU = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
LIBS_LIBASS = @LIBASS_LIBS@
LIBS_LIBPULSE = @LIBPULSE_LIBS@
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
-LIBS_LUA = @LUAJIT_LIBS@
- Add constraints file to allow paralel build - Add changelog to files list to ensure plain rpmbuild to work - Do not bundle luajit remove-vendor-luajit-dependency.patch - Disable the version checking, calling home in desktop apps is really bad idea, esp since upstream is semi-dead - Add patch to fix build with icu59 icu59.patch - Add patch to not put O3 to the cflags aegisub-no-optimize.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=39
2017-06-05 10:22:09 +02:00
+LIBS_LUA = `pkg-config --libs luajit`
LIBS_OPENAL = @OPENAL_LIBS@
LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
LIBS_PTHREAD = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
LIBS_UCHARDET = @UCHARDET_LIBS@
- Add constraints file to allow paralel build - Add changelog to files list to ensure plain rpmbuild to work - Do not bundle luajit remove-vendor-luajit-dependency.patch - Disable the version checking, calling home in desktop apps is really bad idea, esp since upstream is semi-dead - Add patch to fix build with icu59 icu59.patch - Add patch to not put O3 to the cflags aegisub-no-optimize.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=39
2017-06-05 10:22:09 +02:00
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
ifeq (yes, $(BUILD_DARWIN))
-LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
+LIBS_LUA = `pkg-config --libs luajit`
endif
- Add constraints file to allow paralel build - Add changelog to files list to ensure plain rpmbuild to work - Do not bundle luajit remove-vendor-luajit-dependency.patch - Disable the version checking, calling home in desktop apps is really bad idea, esp since upstream is semi-dead - Add patch to fix build with icu59 icu59.patch - Add patch to not put O3 to the cflags aegisub-no-optimize.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=39
2017-06-05 10:22:09 +02:00
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
Accepting request 689868 from home:plater Fix boo#1130889 by fixing aegisub's build against boost 1.69 with aegisub-boost169.patch, reported upstream with patch in issue: https://github.com/Aegisub/Aegisub/issues/93 OBS-URL: https://build.opensuse.org/request/show/689868 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=57
2019-03-29 14:34:01 +01:00
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/Makefile
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
===================================================================
Accepting request 689868 from home:plater Fix boo#1130889 by fixing aegisub's build against boost 1.69 with aegisub-boost169.patch, reported upstream with patch in issue: https://github.com/Aegisub/Aegisub/issues/93 OBS-URL: https://build.opensuse.org/request/show/689868 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=57
2019-03-29 14:34:01 +01:00
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/tools/Makefile 2018-07-10 00:06:51.000000000 +0200
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/Makefile 2019-03-29 13:17:35.252933339 +0200
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
@@ -12,6 +12,4 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I
- Add constraints file to allow paralel build - Add changelog to files list to ensure plain rpmbuild to work - Do not bundle luajit remove-vendor-luajit-dependency.patch - Disable the version checking, calling home in desktop apps is really bad idea, esp since upstream is semi-dead - Add patch to fix build with icu59 icu59.patch - Add patch to not put O3 to the cflags aegisub-no-optimize.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=39
2017-06-05 10:22:09 +02:00
PROGRAM += $(d)repack-thes-dict
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
-$(TOP)tools/respack.lua: $(shell command -v "$(BIN_LUA)")
- Add constraints file to allow paralel build - Add changelog to files list to ensure plain rpmbuild to work - Do not bundle luajit remove-vendor-luajit-dependency.patch - Disable the version checking, calling home in desktop apps is really bad idea, esp since upstream is semi-dead - Add patch to fix build with icu59 icu59.patch - Add patch to not put O3 to the cflags aegisub-no-optimize.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=39
2017-06-05 10:22:09 +02:00
-
include $(TOP)Makefile.target
Accepting request 689868 from home:plater Fix boo#1130889 by fixing aegisub's build against boost 1.69 with aegisub-boost169.patch, reported upstream with patch in issue: https://github.com/Aegisub/Aegisub/issues/93 OBS-URL: https://build.opensuse.org/request/show/689868 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=57
2019-03-29 14:34:01 +01:00
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/libresrc/Makefile
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
===================================================================
Accepting request 689868 from home:plater Fix boo#1130889 by fixing aegisub's build against boost 1.69 with aegisub-boost169.patch, reported upstream with patch in issue: https://github.com/Aegisub/Aegisub/issues/93 OBS-URL: https://build.opensuse.org/request/show/689868 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=57
2019-03-29 14:34:01 +01:00
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/libresrc/Makefile 2018-07-10 00:06:51.000000000 +0200
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/libresrc/Makefile 2019-03-29 13:17:35.252933339 +0200
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
@@ -10,7 +10,7 @@ resrc_OBJ := \
- Add constraints file to allow paralel build - Add changelog to files list to ensure plain rpmbuild to work - Do not bundle luajit remove-vendor-luajit-dependency.patch - Disable the version checking, calling home in desktop apps is really bad idea, esp since upstream is semi-dead - Add patch to fix build with icu59 icu59.patch - Add patch to not put O3 to the cflags aegisub-no-optimize.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=39
2017-06-05 10:22:09 +02:00
$(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
-RESPACK := cd $(TOP)src/libresrc; $(BIN_LUA) $(TOP)tools/respack.lua
- Add constraints file to allow paralel build - Add changelog to files list to ensure plain rpmbuild to work - Do not bundle luajit remove-vendor-luajit-dependency.patch - Disable the version checking, calling home in desktop apps is really bad idea, esp since upstream is semi-dead - Add patch to fix build with icu59 icu59.patch - Add patch to not put O3 to the cflags aegisub-no-optimize.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=39
2017-06-05 10:22:09 +02:00
+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
$(d)bitmap.cpp: $(d)bitmap.h
$(d)default_config.cpp: $(d)default_config.h
Accepting request 689868 from home:plater Fix boo#1130889 by fixing aegisub's build against boost 1.69 with aegisub-boost169.patch, reported upstream with patch in issue: https://github.com/Aegisub/Aegisub/issues/93 OBS-URL: https://build.opensuse.org/request/show/689868 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=57
2019-03-29 14:34:01 +01:00
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/respack.lua
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
===================================================================
Accepting request 689868 from home:plater Fix boo#1130889 by fixing aegisub's build against boost 1.69 with aegisub-boost169.patch, reported upstream with patch in issue: https://github.com/Aegisub/Aegisub/issues/93 OBS-URL: https://build.opensuse.org/request/show/689868 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=57
2019-03-29 14:34:01 +01:00
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/tools/respack.lua 2018-07-10 00:06:51.000000000 +0200
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/respack.lua 2019-03-29 13:17:35.252933339 +0200
Accepting request 632309 from home:plater - Update to current git rev 524c6114a82157b143567240884de3a6d030b091 named version 3.2.2+git20180710 which builds against boost version 1.68, fixes boo#1105217 - Removed the following patches that are fixed upstream: aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. - Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and remove-vendor-luajit-dependency.patch. - For upstream changes see: /usr/share/doc/packages/aegisub/changelog.txt OBS-URL: https://build.opensuse.org/request/show/632309 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
2018-08-30 15:06:57 +02:00
@@ -1,4 +1,4 @@
-#!/usr/bin/env luajit
+#!/usr/bin/lua
-- Copyright (c) 2014, Thomas Goyne <plorkyeran@aegisub.org>
--
-- Permission to use, copy, modify, and distribute this software for any
Copy Permalink