Projects
Multimedia
handbrake
Sign Up
Log In
Username
Password
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
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 6
View file
handbrake.spec
Changed
@@ -49,8 +49,10 @@ Source122: http://download.handbrake.fr/handbrake/contrib/fribidi-0.19.2.tar.gz Source123: http://download.handbrake.fr/handbrake/contrib/yasm-1.1.0.tar.gz Source151: handbrake-ffmpeg_fix_missing_return_in_nonvoid_function.patch -Source152: handbrake-libmkv_no_return_in_nonvoid_function.patch +Source152: handbrake-libmkv_no_return_in_nonvoid_function.patch Source99: handbrake-rpmlintrc +Patch0: handbrake-harfbuzz.patch +Patch1: handbrake-CLI_libs.patch BuildRequires: alsa-devel BuildRequires: curl BuildRequires: fribidi-devel @@ -65,6 +67,9 @@ BuildRequires: subversion BuildRequires: wget BuildRequires: zlib-devel +%if 0%{?suse_version} == 1210 +BuildRequires: gstreamer-utils +%endif BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gudev-1.0) @@ -124,6 +129,9 @@ %setup -q -n "HandBrake-%{version}" %endif +%patch0 -p1 +%patch1 -p0 + # Copy 3rd party dependencies into expected locations: mkdir download for f in \ @@ -158,8 +166,8 @@ # will be removed when the makefiles are fixed, currently # fails on openSUSE factory because of --as-needed # export SUSE_ASNEEDED=0 -export CFLAGS="%{optflags} -fno-strict-aliasing" -export CXXFLAGS="%{optflags} -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing -Wno-unused" +export CXXFLAGS="$CFLAGS -Wno-reorder" # cp "%{S:151}" contrib/ffmpeg/A99-fix-missing-return-in-nonvoid-function.patch cp %{S:152} contrib/libmkv/A99-fix-missing-return-in-nonvoid-function.patch @@ -175,9 +183,12 @@ GHB_PKGS="dbus-glib-1 glib-2.0 gdk-pixbuf-2.0 gudev-1.0 webkit-1.0 libnotify" GHB_PKGS="$GHB_PKGS gstreamer-interfaces-0.10 gstreamer-0.10 gstreamer-pbutils-0.10 gstreamer-video-0.10" +%if 0%{?suse_version} >= 1230 +GHB_PKGS="$GHB_PKGS harfbuzz" +%endif pushd build make libhb/project.h -make %{?_smp_mflags} \ +make %{?_smp_mflags} V=1 \ GHB_CFLAGS="$(pkg-config --cflags $GHB_PKGS) -I../../libhb" \ GHB_LIBS="$(pkg-config --libs $GHB_PKGS)" popd #build
View file
handbrake-CLI_libs.patch
Added
@@ -0,0 +1,11 @@ +--- test/module.defs~ 2011-10-21 20:24:43.000000000 +0200 ++++ test/module.defs 2013-04-05 19:41:18.000000000 +0200 +@@ -12,7 +12,7 @@ + TEST.libs = $(LIBHB.a) $(foreach n, \ + a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \ + ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \ +- $(CONTRIB.build/)lib/lib$(n).a ) ++ $(CONTRIB.build/)lib/lib$(n).a ) $(GHB_LIBS) + + TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe)) +
View file
handbrake-harfbuzz.patch
Added
@@ -0,0 +1,1443 @@ +diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/audiohandler.c HandBrake-0.9.8/gtk/src/audiohandler.c +--- HandBrake-0.9.8.orig/gtk/src/audiohandler.c 2012-05-05 20:13:43.000000000 +0200 ++++ HandBrake-0.9.8/gtk/src/audiohandler.c 2013-04-05 20:37:10.000000000 +0200 +@@ -12,9 +12,9 @@ + */ + + #include "ghbcompat.h" +-#include "hb.h" ++#include "handbrake.h" + #include "settings.h" +-#include "hb-backend.h" ++#include "handbrake-backend.h" + #include "values.h" + #include "callbacks.h" + #include "preview.h" +diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/callbacks.c HandBrake-0.9.8/gtk/src/callbacks.c +--- HandBrake-0.9.8.orig/gtk/src/callbacks.c 2012-06-21 20:31:30.000000000 +0200 ++++ HandBrake-0.9.8/gtk/src/callbacks.c 2013-04-05 20:37:10.000000000 +0200 +@@ -64,7 +64,7 @@ + #include <libappindicator/app-indicator.h> + #endif + +-#include "hb.h" ++#include "handbrake.h" + #include "callbacks.h" + #include "queuehandler.h" + #include "audiohandler.h" +@@ -76,7 +76,7 @@ + #include "values.h" + #include "plist.h" + #include "appcast.h" +-#include "hb-backend.h" ++#include "handbrake-backend.h" + #include "ghb-dvd.h" + #include "ghbcellrenderertext.h" + +diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/handbrake-backend.h HandBrake-0.9.8/gtk/src/handbrake-backend.h +--- HandBrake-0.9.8.orig/gtk/src/handbrake-backend.h 1970-01-01 01:00:00.000000000 +0100 ++++ HandBrake-0.9.8/gtk/src/handbrake-backend.h 2013-04-05 20:56:10.000000000 +0200 +@@ -0,0 +1,184 @@ ++/* ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA ++ */ ++ ++#if !defined(_HBBACKEND_H_) ++#define _HBBACKEND_H_ ++ ++#include "settings.h" ++#include "handbrake.h" ++ ++enum ++{ ++ GHB_ERROR_NONE, ++ GHB_ERROR_CANCELED, ++ GHB_ERROR_FAIL, ++}; ++ ++typedef struct ++{ ++ gint state; ++ ++ // SCANNING ++ gint title_count; ++ gint title_cur; ++ ++ // WORKING ++ gint unique_id; ++ gint job_cur; ++ gint job_count; ++ gdouble progress; ++ gdouble rate_cur; ++ gdouble rate_avg; ++ gint hours; ++ gint minutes; ++ gint seconds; ++ gint error; ++} ghb_instance_status_t; ++ ++typedef struct ++{ ++ ghb_instance_status_t scan; ++ ghb_instance_status_t queue; ++} ghb_status_t; ++ ++#define GHB_PIC_KEEP_WIDTH 0x01 ++#define GHB_PIC_KEEP_HEIGHT 0x02 ++#define GHB_PIC_KEEP_DISPLAY_WIDTH 0x04 ++#define GHB_PIC_KEEP_DISPLAY_HEIGHT 0x08 ++#define GHB_PIC_KEEP_DAR 0x10 ++#define GHB_PIC_KEEP_PAR 0x20 ++#define GHB_PIC_USE_MAX 0x40 ++ ++typedef struct ++{ ++ gchar *path; ++ gchar *name; ++ gint index; ++ gint type; ++ char *video_codec_name; ++ gint width; ++ gint height; ++ gint crop[4]; ++ gint num_chapters; ++ gint rate; ++ gint rate_base; ++ gint interlaced; ++ gint aspect_n; ++ gint aspect_d; ++ gint hours; ++ gint minutes; ++ gint seconds; ++ gint64 duration; ++ gint angle_count; ++} ghb_title_info_t; ++ ++#define GHB_AUDIO_SAMPLERATE 1 ++#define GHB_AUDIO_BITRATE 2 ++#define GHB_FRAMERATE 3 ++ ++const gchar* ghb_version(void); ++void ghb_vquality_range( ++ signal_user_data_t *ud, ++ gdouble *min, ++ gdouble *max, ++ gdouble *step, ++ gdouble *page, ++ gint *digits, ++ gboolean *inverted); ++//const gchar* ghb_get_rate_string(gint rate, gint type); ++void ghb_combo_init(signal_user_data_t *ud); ++void ghb_backend_init(gint debug); ++void ghb_backend_close(void); ++void ghb_add_job(GValue *js, gint unique_id); ++void ghb_remove_job(gint unique_id); ++void ghb_start_queue(void); ++void ghb_stop_queue(void); ++void ghb_pause_queue(void); ++ ++void ghb_add_live_job(GValue *js, gint unique_id); ++void ghb_start_live_encode(); ++void ghb_stop_live_encode(); ++ ++void ghb_clear_scan_state(gint state); ++void ghb_clear_queue_state(gint state); ++ ++void ghb_set_state(gint state); ++gint ghb_get_scan_state(); ++gint ghb_get_queue_state(); ++void ghb_get_status(ghb_status_t *status); ++void ghb_track_status(void); ++void ghb_backend_scan(const gchar *path, gint titleindex, gint preview_count, guint64 min_duration); ++void ghb_backend_scan_stop(); ++void ghb_backend_queue_scan(const gchar *path, gint titleindex); ++gboolean ghb_get_title_info(ghb_title_info_t *tinfo, gint titleindex); ++void ghb_par_init(signal_user_data_t *ud); ++void ghb_set_scale(signal_user_data_t *ud, gint mode); ++void ghb_set_scale_settings(GValue *settings, gint mode); ++GValue* ghb_get_chapters(gint titleindex); ++void ghb_get_chapter_duration(gint ti, gint ii, gint *hh, gint *mm, gint *ss); ++void ghb_part_duration(gint tt, gint sc, gint ec, gint *hh, gint *mm, gint *ss); ++gint ghb_get_best_mix(hb_audio_config_t *aconfig, gint acodec, gint mix); ++gboolean ghb_ac3_in_audio_list(const GValue *audio_list); ++gboolean ghb_audio_is_passthru(gint acodec); ++gboolean ghb_audio_can_passthru(gint acodec); ++gint ghb_get_default_acodec(void); ++hb_audio_config_t* ghb_get_scan_audio_info(gint titleindex, gint audioindex); ++void ghb_set_bitrate_opts( ++ GtkBuilder *builder, gint first_rate, gint last_rate, gint extra_rate); ++void ghb_grey_combo_options(signal_user_data_t *ud); ++void ghb_update_ui_combo_box( ++ signal_user_data_t *ud, const gchar *name, gint user_data, gboolean all); ++gchar* ghb_get_source_audio_lang(gint titleindex, gint track); ++gint ghb_find_audio_track( ++ gint titleindex, const gchar *lang, gint acodec, ++ gint fallback_acodec, GHashTable *track_indices); ++const gchar* ghb_audio_track_description(gint track, int titleindex); ++void ghb_add_all_subtitles(signal_user_data_t *ud, gint titleindex); ++gint ghb_find_pref_subtitle_track(const gchar *lang); ++gint ghb_find_subtitle_track( ++ gint titleindex, const gchar *lang, gboolean burn, ++ gboolean force, gint source, GHashTable *track_indices); ++gint ghb_pick_subtitle_track(signal_user_data_t *ud); ++gint ghb_find_cc_track(gint titleindex); ++gint ghb_longest_title(void); ++gchar* ghb_build_advanced_opts_string(GValue *settings); ++GdkPixbuf* ghb_get_preview_image( ++ gint titleindex, gint index, signal_user_data_t *ud,
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.