diff --git a/aegisub-2.1.8.99.rev5789-ld.patch b/aegisub-2.1.8.99.rev5789-ld.patch deleted file mode 100644 index a3c6d30..0000000 --- a/aegisub-2.1.8.99.rev5789-ld.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am.orig -+++ src/Makefile.am -@@ -54,7 +54,7 @@ aegisub_2_1_LDADD += libaudio_player.a - if HAVE_ALSA - noinst_LIBRARIES += libaudio_alsa.a - libaudio_alsa_a_SOURCES = audio_player_alsa.cpp --aegisub_2_1_LDADD += libaudio_alsa.a @ALSA_LIBS@ -+aegisub_2_1_LDADD += libaudio_alsa.a @ALSA_LIBS@ -lrt - endif - - if HAVE_PORTAUDIO -Index: src/Makefile.in -=================================================================== ---- src/Makefile.in.orig -+++ src/Makefile.in -@@ -40,7 +40,7 @@ host_triplet = @host@ - bin_PROGRAMS = aegisub-2.1$(EXEEXT) - @BUILD_DARWIN_TRUE@am__append_3 = -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries - @HAVE_ALSA_TRUE@am__append_4 = libaudio_alsa.a --@HAVE_ALSA_TRUE@am__append_5 = libaudio_alsa.a @ALSA_LIBS@ -+@HAVE_ALSA_TRUE@am__append_5 = libaudio_alsa.a @ALSA_LIBS@ -lrt - @HAVE_PORTAUDIO_TRUE@am__append_6 = libaudio_portaudio.a - @HAVE_PORTAUDIO_TRUE@am__append_7 = libaudio_portaudio.a @PORTAUDIO_LIBS@ - @HAVE_PULSEAUDIO_TRUE@am__append_8 = libaudio_pulseaudio.a diff --git a/aegisub-2.1.9-no_glu.patch b/aegisub-2.1.9-no_glu.patch deleted file mode 100644 index 557d942..0000000 --- a/aegisub-2.1.9-no_glu.patch +++ /dev/null @@ -1,153 +0,0 @@ -Index: configure -=================================================================== ---- configure.orig -+++ configure -@@ -20102,55 +20102,6 @@ See \`config.log' for more details." "$L - fi - - -- aegisub_save_LIBS="$LIBS" -- aegisub_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$GL_CFLAGS" -- LIBS="$GL_LIBS -lGLU" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenGLU works" >&5 --$as_echo_n "checking whether OpenGLU works... " >&6; } --if test "${agi_cv_with_openglu+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then : -- if test $? -ne 0; then -- eval agi_cv_with_openglu="no"; -- else -- eval agi_cv_with_openglu="yes"; -- fi --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#include --int main(void) { -- return 0; --} --_ACEOF --if ac_fn_cxx_try_run "$LINENO"; then : -- eval agi_cv_with_openglu="yes" --else -- eval agi_cv_with_openglu="no" --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $agi_cv_with_openglu" >&5 --$as_echo "$agi_cv_with_openglu" >&6; } -- CPPFLAGS="$aegisub_save_CPPFLAGS" -- LIBS="$aegisub_save_LIBS" -- -- --if test "$agi_cv_with_openglu" = "no" && test "$build_darwin" != "yes"; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "Please install a working OpenGL GLU library. --See \`config.log' for more details." "$LINENO" 5; } --fi -- -- - ########### - ## Freetype - ########### -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -368,16 +368,6 @@ if test "$agi_cv_with_opengl" = "no"; th - AC_MSG_FAILURE([Please install a working OpenGL library.]) - fi - --AC_AGI_COMPILE([OpenGLU], [openglu], [$GL_CFLAGS], [$GL_LIBS -lGLU],[ --#include --int main(void) { -- return 0; --}]) -- --if test "$agi_cv_with_openglu" = "no" && test "$build_darwin" != "yes"; then -- AC_MSG_FAILURE([Please install a working OpenGL GLU library.]) --fi -- - - ########### - ## Freetype -Index: src/gl_wrap.h -=================================================================== ---- src/gl_wrap.h.orig -+++ src/gl_wrap.h -@@ -40,7 +40,6 @@ - #include - #else - #include --#include - typedef GLuint GLhandleARB; - #endif - #include -Index: src/stdwx.h -=================================================================== ---- src/stdwx.h.orig -+++ src/stdwx.h -@@ -232,7 +232,6 @@ - #include - #else - #include --#include - #endif - - #ifndef _CRT_SECURE_NO_WARNINGS -Index: src/video_context.cpp -=================================================================== ---- src/video_context.cpp.orig -+++ src/video_context.cpp -@@ -43,7 +43,6 @@ - #include - #else - #include --#include - #endif - #include - #include -Index: src/video_context.h -=================================================================== ---- src/video_context.h.orig -+++ src/video_context.h -@@ -53,7 +53,6 @@ - #include - #else - #include --#include - typedef GLuint GLhandleARB; - #endif - #include "video_frame.h" -Index: src/video_display.cpp -=================================================================== ---- src/video_display.cpp.orig -+++ src/video_display.cpp -@@ -44,7 +44,6 @@ - #include - #else - #include --#include - #endif - #include - #include -Index: src/video_out_gl.cpp -=================================================================== ---- src/video_out_gl.cpp.orig -+++ src/video_out_gl.cpp -@@ -50,7 +50,6 @@ using std::max; - #include - #else - #include --#include - #endif - - #include "video_out_gl.h" diff --git a/aegisub-2.1.9-system_libs.patch b/aegisub-2.1.9-system_libs.patch deleted file mode 100644 index a6e08df..0000000 --- a/aegisub-2.1.9-system_libs.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: src/gl_wrap.cpp -=================================================================== ---- src/gl_wrap.cpp.orig -+++ src/gl_wrap.cpp -@@ -45,7 +45,7 @@ - #include - #else - #include --#include "gl/glext.h" -+#include "GL/glext.h" - #endif - #include "gl_wrap.h" - #include "options.h" -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am.orig -+++ src/Makefile.am -@@ -345,8 +345,6 @@ aegisub_2_1_SOURCES += \ - $(srcdir)/config/*.h - - noinst_HEADERS = \ -- $(srcdir)/boost/*.hpp \ -- gl/glext.h \ - $(srcdir)/*.hxx - - EXTRA_DIST = \ -Index: src/Makefile.in -=================================================================== ---- src/Makefile.in.orig -+++ src/Makefile.in -@@ -843,8 +843,6 @@ aegisub_2_1_SOURCES = $(AUTO3_LUA) $(HUN - visual_tool_vector_clip.cpp $(srcdir)/*.h \ - $(srcdir)/include/aegisub/*.h $(srcdir)/config/*.h - noinst_HEADERS = \ -- $(srcdir)/boost/*.hpp \ -- gl/glext.h \ - $(srcdir)/*.hxx - - EXTRA_DIST = \ diff --git a/aegisub-2.1.9-underlinking.patch b/aegisub-2.1.9-underlinking.patch deleted file mode 100644 index e579598..0000000 --- a/aegisub-2.1.9-underlinking.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am.orig -+++ src/Makefile.am -@@ -31,7 +31,7 @@ SUBDIRS = \ - AM_CXXFLAGS += -DAEGISUB -Iinclude @CXXFLAGS_OSX@ @WX_CXXFLAGS@ @OPENMP_CXXFLAGS@ @LIBASS_CFLAGS@ - - bin_PROGRAMS = aegisub-2.1 --aegisub_2_1_LDADD = libresrc/libresrc.a $(libosxutil_lib) -+aegisub_2_1_LDADD = libresrc/libresrc.a $(libosxutil_lib) -lz - aegisub_2_1_CXXFLAGS = @FREETYPE_CFLAGS@ $(AM_CXXFLAGS) - aegisub_2_1_LDFLAGS = @DEBUG_FLAGS@ @PROFILE_FLAGS@ @GL_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@ @ICONV_LIBS@ $(libosxutil_ldflags) @CCMALLOC_LDFLAGS@ @EFENCE_LDFLAGS@ - LIBS += @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @CCMALLOC_LIBS@ -Index: src/Makefile.in -=================================================================== ---- src/Makefile.in.orig -+++ src/Makefile.in -@@ -719,7 +719,7 @@ SUBDIRS = \ - $(libauto3) \ - $(libosxutil_subdir) - --aegisub_2_1_LDADD = libresrc/libresrc.a $(libosxutil_lib) \ -+aegisub_2_1_LDADD = libresrc/libresrc.a $(libosxutil_lib) -lz \ - libaudio_player.a $(am__append_5) $(am__append_7) \ - $(am__append_9) $(am__append_11) $(am__append_13) \ - $(am__append_15) libsubtitle_provider.a $(am__append_18) \ diff --git a/aegisub-2.1.9.tar.gz b/aegisub-2.1.9.tar.gz deleted file mode 100644 index 46c5d52..0000000 --- a/aegisub-2.1.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac1f20751f3d2732d7e11627ea4cc30b53cb905d11422925b7f881785d373706 -size 2538256 diff --git a/aegisub-3.0.2.tar.xz b/aegisub-3.0.2.tar.xz new file mode 100644 index 0000000..17e5d5b --- /dev/null +++ b/aegisub-3.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68ec20cf49f513608cec400bd462ebb762d6057109968fb01d842e10e6e7fb39 +size 4146088 diff --git a/aegisub.changes b/aegisub.changes index f9a0a6e..bbad1a2 100644 --- a/aegisub.changes +++ b/aegisub.changes @@ -1,3 +1,70 @@ +------------------------------------------------------------------- +Tue Oct 23 16:07:15 UTC 2012 - reddwarf@opensuse.org + +- Removed aegisub-3.0.0-docdir.patch and aegisub-3.0.0-no_glu.patch, + they have been applied upstream +- Update to 3.0.2 + * Allow framerate transform to/from variable without external timecodes loaded (#1530) + * Honor the configured limits for the find/replace history (#1528) + * Fix occassional non-error dialog when running multiple copies of Aegisub + * Fix bug that sometimes resulted in later karaoke syllables moving when early ones were modified + * Truncate overly long syllables rather than adjusting all of the other syllables to make them fit + * Play right-clicked syllables + * Fix splitting lines by karaoke (#1541) + * Remove dependency on glu + * Honor docdir and localedir configuration variables + * Make it possible to type style names again + * Break undo grouping after 30 seconds of inactivity rather than 10 + * Switch the Duration field back to time mode when video is closed + * Save a single wav containing all selected lines rather than a separate wav for each line with "Create audio clip" + * Make pasting lines not horrible slow (#1534) + * Make the correct row visible when selecting rows with shift + arrow keys in the grid (#1533) + * Fix a few errors in the German translation (#1523) + * Update Czech translation + * Update Indonesian translation + * Update Hungarian translation + * Add partial Arabic translation (#1532) + +------------------------------------------------------------------- +Mon Oct 8 22:19:57 UTC 2012 - reddwarf@opensuse.org + +- Update to 3.0.1 + * Updated Russian translation + * Updated Greek translation + * Partially update Finnish translation + * Fixed some errors in the Portuguese translation + * Fix packaging issues with the Serbian translation + * Update the size of the karaoke syllable bar when the window is resized + * Add scroll arrows to the karaoke syllable bar when the contents are too wide to fit + * Change the color of the karaoke syllable split cursor to indicate whether it'll add or remove a split + * Increase the hit area for removing karaoke splits a little + * Remove the correct split when clicking to the left of a split line + * Re-add the "Play current line" button to the audio toolbar + * Stop video playback when the stop button is clicked in the audio toolbar as 2.1.9 did + * Scroll the audio display after a click near an edge when auto-scrolling is enabled + * Recenter the audio display if a newly selected line is very close to an edge in addition to if it's not fully onscreen, as 2.1 did + * Fix subtitle timing issues after loading a timecodes file + * Fix rounding error that resulted in 30000/1001 FPS video being treated as 30001/1001 FPS + +------------------------------------------------------------------- +Sun Oct 7 22:16:05 UTC 2012 - reddwarf@opensuse.org + +- Update to 3.0.0 + * The audio display and related things such as the karaoke + syllable splitting interface have been rewritten from scratch. + The spectograph rendering is now much higher quality and + faster, and many new features have been added. + * Changes made in the main edit box and surrounding controls no + longer have to be committed. Instead, changes are made to the + file as you type, with the video display updating in real time. + * See http://www.aegisub.org/changelog/3.0.0/ for details +- Remove aegisub-2.1.9-system_libs.patch, aegisub-2.1.8.99.rev5789-ld.patch + and aegisub-2.1.9-underlinking.patch. Fixed upstream. +- Update aegisub-2.1.9-no_glu.patch to aegisub-3.0.0-no_glu.patch +- Add aegisub-3.0.0-docdir.patch +- Build only the two relevant audio output backends: ALSA and PulseAudio +- The scripting system no longer supports Perl and Ruby, remove BuildRequires + ------------------------------------------------------------------- Fri Sep 21 10:20:14 UTC 2012 - reddwarf@opensuse.org diff --git a/aegisub.spec b/aegisub.spec index db77bc3..13fb71a 100644 --- a/aegisub.spec +++ b/aegisub.spec @@ -17,54 +17,33 @@ %bcond_with ffms2 -%bcond_with perl -%bcond_with ruby Name: aegisub -Version: 2.1.9 +Version: 3.0.2 Release: 0 Summary: Subtitle editor 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.gz -# PATCH-FEATURE-OPENSUSE aegisub-2.1.9-system_libs.patch reddwarf@opensuse.org -- Use system libraries instead of included ones -Patch0: aegisub-2.1.9-system_libs.patch -# PATCH-FIX-UPSTREAM aegisub-2.1.8.99.rev5789-ld.patch reddwarf@opensuse.org -- Link against librt. Fixed upstream. -Patch1: aegisub-2.1.8.99.rev5789-ld.patch -# PATCH-FIX-UPSTREAM aegisub-2.1.9-underlinking.patch reddwarf@opensuse.org -- Link against libz, Fixed upstream. -Patch2: aegisub-2.1.9-underlinking.patch -# PATCH-FIX-UPSTREAM aegisub-2.1.9-no_glu.patch http://devel.aegisub.org/ticket/1511 reddwarf@opensuse.org -- Don't ask for GLU since it's not being used -Patch3: aegisub-2.1.9-no_glu.patch -BuildRequires: ImageMagick -BuildRequires: boost-devel >= 1.34 +Source0: http://ftp.aegisub.org/pub/releases/aegisub-%{version}.tar.xz BuildRequires: gcc-c++ -BuildRequires: intltool BuildRequires: pkg-config >= 0.20 -BuildRequires: update-desktop-files %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires -BuildRequires: wxWidgets-devel >= 2.8.1 +BuildRequires: wxWidgets-devel >= 2.9.3 BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(fftw3) >= 3.3 BuildRequires: pkgconfig(fontconfig) >= 2.4 -BuildRequires: pkgconfig(freetype2) >= 9.7.0 BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(hunspell) >= 1.2.0 BuildRequires: pkgconfig(libass) BuildRequires: pkgconfig(libpulse) >= 0.5 BuildRequires: pkgconfig(lua) < 5.2 BuildRequires: pkgconfig(lua) >= 5.1 -BuildRequires: pkgconfig(openal) +BuildRequires: pkgconfig(zlib) %if %{with ffms2} BuildRequires: pkgconfig(ffms2) %endif -%if %{with perl} -BuildRequires: perl >= 5.004 -Requires: perl = %{perl_version} -%endif -%if %{with ruby} -BuildRequires: ruby-devel >= 1.8 -%endif %description Aegisub is an advanced subtitle editor for Windows, and UNIX-like systems, such @@ -76,37 +55,31 @@ from just basic timed text. Aegisub's goal is to support using these advanced functions with ease. %prep -%setup -q -%patch0 -%patch1 -%patch2 -%patch3 -rm -r src/boost -rm -r src/gl +%setup -q -n aegisub +cd aegisub FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/version.cpp FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/version.cpp %build -%configure \ - %{!?with_ruby:--without-ruby} \ - %{!?with_perl:--without-perl} \ - --with-player-audio=pulseaudio \ - --docdir='%{_docdir}' +cd aegisub +# Don't use --disable-update-checker because of http://blog.aegisub.org/2012/02/bit-of-statistics.html +%configure --with-player-audio=PulseAudio \ + --without-oss make %{?_smp_mflags} %install +cd aegisub %make_install -%suse_update_desktop_file %{name} -%find_lang %{name}21 +%find_lang %{name}-30 -%files -f %{name}21.lang +%files -f aegisub/%{name}-30.lang %defattr(0644, root, root, 0755) -%{_docdir}/%{name} -%attr(0755,root,root) %{_bindir}/%{name}-2.1 -%{_datadir}/%{name} -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.* +%doc aegisub/LICENCE +%attr(0755,root,root) %{_bindir}/aegisub-3.0 +%{_datadir}/aegisub/ +%{_datadir}/applications/aegisub.desktop +%{_datadir}/icons/hicolor/*/apps/aegisub.* %changelog