Overview

Request 463 (accepted)

Update to 0.9.9, no idea where I got the .ebuild from ...

Submit package home:dnh:branches:Multimedia / handbrake to package Multimedia / handbrake

handbrake.changes Changed
x
 
1
@@ -1,4 +1,12 @@
2
 -------------------------------------------------------------------
3
+Thu Jun 13 01:08:41 UTC 2013 - dnh@opensuse.org
4
+
5
+- update to 0.9.9
6
+  * replace harfbuzz patch by script fragement in spec
7
+  * update yasm, libbluray, x264, replace ffmpeg by libav
8
+  * remove tarballs that can be system-libs
9
+
10
+-------------------------------------------------------------------
11
 Sat Apr  6 08:27:48 UTC 2013 - dnh@opensuse.org
12
 
13
 - fix conflicts with harfbuzz headers for oS >= 12.3
14
handbrake.spec Changed
143
 
1
@@ -14,9 +14,7 @@
2
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
3
 
4
 Name:           handbrake
5
-#define rev 3549
6
-#Version:          0.9.4+r%{rev}
7
-Version:        0.9.8
8
+Version:        0.9.9
9
 Release:        1.pm.1
10
 License:        GPL-2.0+
11
 Summary:        Multithreaded Video Transcoder
12
@@ -27,32 +25,21 @@
13
 Source:         http://prdownloads.sourceforge.net/handbrake/HandBrake-%{version}.tar.bz2
14
 Source101:      http://download.handbrake.fr/handbrake/contrib/a52dec-0.7.4.tar.gz
15
 Source102:      http://download.handbrake.fr/handbrake/contrib/faac-1.28.tar.gz
16
-Source103:      http://download.handbrake.fr/handbrake/contrib/faad2-2.7.tar.gz
17
-Source104:      http://download.handbrake.fr/handbrake/contrib/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2
18
-Source105:      http://download.handbrake.fr/handbrake/contrib/lame-3.98.tar.gz
19
-Source106:      http://download.handbrake.fr/handbrake/contrib/libdca-r81-strapped.tar.gz
20
-Source107:      http://download.handbrake.fr/handbrake/contrib/libdvdnav-svn1168.tar.gz
21
-Source108:      http://download.handbrake.fr/handbrake/contrib/libdvdread-svn1168.tar.gz
22
+#Source103:      http://download.handbrake.fr/handbrake/contrib/faad2-2.7.tar.gz
23
+Source104:      http://download.handbrake.fr/handbrake/contrib/libav-v9.6.tar.bz2
24
+Source105:      http://download.handbrake.fr/handbrake/contrib/yasm-1.2.0.tar.gz
25
+Source106:      http://download.handbrake.fr/handbrake/contrib/lame-3.98.tar.gz
26
+Source107:      http://download.handbrake.fr/handbrake/contrib/libdvdread-svn1168.tar.gz
27
+Source108:      http://download.handbrake.fr/handbrake/contrib/libdvdnav-svn1168.tar.gz
28
 Source109:      http://download.handbrake.fr/handbrake/contrib/libmkv-0.6.5-0-g82075ae.tar.gz
29
-Source110:      http://download.handbrake.fr/handbrake/contrib/libogg-1.3.0.tar.gz
30
-Source111:      http://download.handbrake.fr/handbrake/contrib/libsamplerate-0.1.4.tar.gz
31
-Source112:      http://download.handbrake.fr/handbrake/contrib/libtheora-1.1.0.tar.bz2
32
-Source113:      http://download.handbrake.fr/handbrake/contrib/libvorbis-aotuv_b6.03.tar.bz2
33
-Source114:      http://download.handbrake.fr/handbrake/contrib/mp4v2-trunk-r355.tar.bz2
34
-Source115:      http://download.handbrake.fr/handbrake/contrib/mpeg2dec-0.5.1.tar.gz
35
-Source116:      http://download.handbrake.fr/handbrake/contrib/x264-r2146-bcd41db.tar.gz
36
-Source117:      http://download.m0k.org/handbrake/contrib/fontconfig-2.8.0.tar.gz
37
-Source118:      http://download.handbrake.fr/handbrake/contrib/freetype-2.4.7.tar.bz2
38
-Source119:      http://download.handbrake.fr/handbrake/contrib/libass-0.10.0-1.tar.gz
39
-Source120:      http://download.handbrake.fr/handbrake/contrib/libbluray-0.0.1-pre-213-ga869da8.tar.gz
40
-Source121:      http://download.m0k.org/handbrake/contrib/libxml2-2.7.7.tar.gz
41
-Source122:      http://download.handbrake.fr/handbrake/contrib/fribidi-0.19.2.tar.gz
42
-Source123:      http://download.handbrake.fr/handbrake/contrib/yasm-1.1.0.tar.gz
43
+Source110:      http://download.handbrake.fr/handbrake/contrib/mp4v2-trunk-r355.tar.bz2
44
+Source111:      http://download.handbrake.fr/handbrake/contrib/mpeg2dec-0.5.1.tar.gz
45
+Source112:      http://download.handbrake.fr/handbrake/contrib/x264-r2273-b3065e6.tar.gz
46
+Source113:      http://download.handbrake.fr/handbrake/contrib/libbluray-0.2.3.tar.bz2
47
+#Source120:      http://download.handbrake.fr/handbrake/contrib/libdca-r81-strapped.tar.gz
48
 Source151:      handbrake-ffmpeg_fix_missing_return_in_nonvoid_function.patch
49
 Source152:      handbrake-libmkv_no_return_in_nonvoid_function.patch
50
 Source99:       handbrake-rpmlintrc
51
-Patch0:         handbrake-harfbuzz.patch
52
-Patch1:         handbrake-CLI_libs.patch
53
 BuildRequires:  alsa-devel
54
 BuildRequires:  curl
55
 BuildRequires:  fribidi-devel
56
@@ -92,9 +79,9 @@
57
 BuildRequires:  intltool
58
 BuildRequires:  libtool
59
 BuildRequires:  make
60
-BuildRequires:  nasm
61
 BuildRequires:  update-desktop-files
62
-BuildRequires:  yasm
63
+BuildRequires:  fontconfig-devel freetype2-devel libxml2-devel libass-devel
64
+BuildRequires:  libogg-devel libvorbis-devel libtheora-devel libsamplerate-devel
65
 
66
 %description
67
 HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video
68
@@ -129,16 +116,22 @@
69
 %setup -q -n "HandBrake-%{version}"
70
 %endif
71
 
72
-%patch0 -p1
73
-%patch1 -p0
74
+# unstable, so patch from 0.9.8 did not apply, use the script
75
+# used to generate the patch instead
76
+mv -i libhb/hb.h libhb/handbrake.h
77
+mv -i gtk/src/hb-backend.h gtk/src/handbrake-backend.h
78
+find \( -name '*.h' -o -name '*.c' \) -exec \
79
+    grep -l 'include.*"hb.h\|hb-backend.h"' {} + | \
80
+    xargs perl -pi -e 's/include\s*"hb.h"/include "handbrake.h"/;
81
+      s/include\s*"hb-backend.h"/include "handbrake-backend.h"/'
82
 
83
 # Copy 3rd party dependencies into expected locations:
84
 mkdir download
85
+# 
86
 for f in \
87
-%{S:101} %{S:102} %{S:103} %{S:104} %{S:105} %{S:106} \
88
+%{S:101} %{S:102} %{S:104} %{S:105} %{S:106} \
89
 %{S:107} %{S:108} %{S:109} %{S:110} %{S:111} %{S:112} \
90
-%{S:113} %{S:114} %{S:115} %{S:116} %{S:117} %{S:118} \
91
-%{S:119} %{S:120} %{S:121} %{S:122} %{S:123} \
92
+%{S:113} \
93
 ; do
94
      ln -s "$f" download/
95
 done
96
@@ -151,7 +144,10 @@
97
 | while read url; do
98
      f=$(echo "$url" | sed 's|^.*/||')
99
      case $f in
100
-         bzip2*|libiconv*|pthreads*|zlib*) continue ;;
101
+         bzip2*|libiconv*|pthreads*|zlib*|autoconf*|automake*|\
102
+          fdk-aac*|fontconfig*|freetype*|libass*|libogg*|libsamplerate*|\
103
+          libtheora*|libtool*|libvorbis*|libxml2*|m4*)
104
+            continue ;;
105
      esac
106
      [ -e "$RPM_SOURCE_DIR/$f" ] || echo "$url">>"$missing"
107
 done
108
@@ -163,22 +159,20 @@
109
 fi
110
 
111
 %build
112
-# will be removed when the makefiles are fixed, currently
113
-# fails on openSUSE factory because of --as-needed
114
-# export SUSE_ASNEEDED=0
115
 export CFLAGS="%{optflags} -fno-strict-aliasing -Wno-unused"
116
 export CXXFLAGS="$CFLAGS -Wno-reorder"
117
+export PATH="%{_builddir}/HandBrake-%{version}/build/contrib/bin:$PATH"
118
 
119
-# cp "%{S:151}" contrib/ffmpeg/A99-fix-missing-return-in-nonvoid-function.patch
120
 cp %{S:152} contrib/libmkv/A99-fix-missing-return-in-nonvoid-function.patch
121
 
122
-mkdir build
123
+mkdir -p build
124
 ./configure \
125
      --force \
126
      --build="$PWD/build" \
127
      --prefix="%{buildroot}%{_prefix}" \
128
      --strip="/bin/true" \
129
      --optimize=speed \
130
+     --enable-ff-mpeg2 \
131
      --debug=max
132
 
133
 GHB_PKGS="dbus-glib-1 glib-2.0 gdk-pixbuf-2.0 gudev-1.0 webkit-1.0 libnotify"
134
@@ -189,7 +183,7 @@
135
 pushd build
136
 make libhb/project.h
137
 make %{?_smp_mflags} V=1 \
138
-    GHB_CFLAGS="$(pkg-config --cflags $GHB_PKGS) -I../../libhb" \
139
+    GHB_CFLAGS="$(pkg-config --cflags $GHB_PKGS) -I../../libhb -I../../contrib/include" \
140
     GHB_LIBS="$(pkg-config --libs $GHB_PKGS)"
141
 popd #build
142
 
143
handbrake-CLI_libs.patch Deleted
13
 
1
@@ -1,11 +0,0 @@
2
---- test/module.defs~  2011-10-21 20:24:43.000000000 +0200
3
-+++ test/module.defs   2013-04-05 19:41:18.000000000 +0200
4
-@@ -12,7 +12,7 @@
5
- TEST.libs = $(LIBHB.a) $(foreach n, \
6
-         a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
7
-         ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
8
--        $(CONTRIB.build/)lib/lib$(n).a )
9
-+        $(CONTRIB.build/)lib/lib$(n).a ) $(GHB_LIBS)
10
- 
11
- TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
12
- 
13
handbrake-harfbuzz.patch Deleted
1445
 
1
@@ -1,1443 +0,0 @@
2
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/audiohandler.c HandBrake-0.9.8/gtk/src/audiohandler.c
3
---- HandBrake-0.9.8.orig/gtk/src/audiohandler.c    2012-05-05 20:13:43.000000000 +0200
4
-+++ HandBrake-0.9.8/gtk/src/audiohandler.c 2013-04-05 20:37:10.000000000 +0200
5
-@@ -12,9 +12,9 @@
6
-  */
7
- 
8
- #include "ghbcompat.h"
9
--#include "hb.h"
10
-+#include "handbrake.h"
11
- #include "settings.h"
12
--#include "hb-backend.h"
13
-+#include "handbrake-backend.h"
14
- #include "values.h"
15
- #include "callbacks.h"
16
- #include "preview.h"
17
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/callbacks.c HandBrake-0.9.8/gtk/src/callbacks.c
18
---- HandBrake-0.9.8.orig/gtk/src/callbacks.c   2012-06-21 20:31:30.000000000 +0200
19
-+++ HandBrake-0.9.8/gtk/src/callbacks.c    2013-04-05 20:37:10.000000000 +0200
20
-@@ -64,7 +64,7 @@
21
- #include <libappindicator/app-indicator.h>
22
- #endif
23
- 
24
--#include "hb.h"
25
-+#include "handbrake.h"
26
- #include "callbacks.h"
27
- #include "queuehandler.h"
28
- #include "audiohandler.h"
29
-@@ -76,7 +76,7 @@
30
- #include "values.h"
31
- #include "plist.h"
32
- #include "appcast.h"
33
--#include "hb-backend.h"
34
-+#include "handbrake-backend.h"
35
- #include "ghb-dvd.h"
36
- #include "ghbcellrenderertext.h"
37
- 
38
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/handbrake-backend.h HandBrake-0.9.8/gtk/src/handbrake-backend.h
39
---- HandBrake-0.9.8.orig/gtk/src/handbrake-backend.h   1970-01-01 01:00:00.000000000 +0100
40
-+++ HandBrake-0.9.8/gtk/src/handbrake-backend.h    2013-04-05 20:56:10.000000000 +0200
41
-@@ -0,0 +1,184 @@
42
-+/*
43
-+ * This program is free software; you can redistribute it and/or modify
44
-+ * it under the terms of the GNU General Public License as published by
45
-+ * the Free Software Foundation; either version 2 of the License, or
46
-+ * (at your option) any later version.
47
-+ * 
48
-+ * This program is distributed in the hope that it will be useful,
49
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
50
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
51
-+ * GNU Library General Public License for more details.
52
-+ * 
53
-+ * You should have received a copy of the GNU General Public License
54
-+ * along with this program; if not, write to the Free Software
55
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
56
-+ */
57
-+ 
58
-+#if !defined(_HBBACKEND_H_)
59
-+#define _HBBACKEND_H_
60
-+
61
-+#include "settings.h"
62
-+#include "handbrake.h"
63
-+
64
-+enum
65
-+{
66
-+  GHB_ERROR_NONE,
67
-+  GHB_ERROR_CANCELED,
68
-+  GHB_ERROR_FAIL,
69
-+};
70
-+
71
-+typedef struct
72
-+{
73
-+  gint state;
74
-+
75
-+  // SCANNING
76
-+  gint title_count;
77
-+  gint title_cur;
78
-+
79
-+  // WORKING
80
-+  gint unique_id;
81
-+  gint job_cur;
82
-+  gint job_count;
83
-+  gdouble progress;
84
-+  gdouble rate_cur;
85
-+  gdouble rate_avg;
86
-+  gint hours;
87
-+  gint minutes;
88
-+  gint seconds;
89
-+  gint error;
90
-+} ghb_instance_status_t;
91
-+
92
-+typedef struct
93
-+{
94
-+  ghb_instance_status_t scan;
95
-+  ghb_instance_status_t queue;
96
-+} ghb_status_t;
97
-+
98
-+#define GHB_PIC_KEEP_WIDTH          0x01
99
-+#define GHB_PIC_KEEP_HEIGHT         0x02
100
-+#define GHB_PIC_KEEP_DISPLAY_WIDTH  0x04
101
-+#define GHB_PIC_KEEP_DISPLAY_HEIGHT 0x08
102
-+#define GHB_PIC_KEEP_DAR            0x10
103
-+#define GHB_PIC_KEEP_PAR            0x20
104
-+#define GHB_PIC_USE_MAX             0x40
105
-+
106
-+typedef struct
107
-+{
108
-+  gchar *path;
109
-+  gchar *name;
110
-+  gint index;
111
-+  gint type;
112
-+  char *video_codec_name;
113
-+  gint width;
114
-+  gint height;
115
-+  gint crop[4];
116
-+  gint num_chapters;
117
-+  gint rate;
118
-+  gint rate_base;
119
-+  gint interlaced;
120
-+  gint aspect_n;
121
-+  gint aspect_d;
122
-+  gint hours;
123
-+  gint minutes;
124
-+  gint seconds;
125
-+  gint64 duration;
126
-+  gint angle_count;
127
-+} ghb_title_info_t;
128
-+
129
-+#define GHB_AUDIO_SAMPLERATE 1
130
-+#define GHB_AUDIO_BITRATE 2
131
-+#define GHB_FRAMERATE 3
132
-+
133
-+const gchar* ghb_version(void);
134
-+void ghb_vquality_range(
135
-+  signal_user_data_t *ud, 
136
-+  gdouble *min, 
137
-+  gdouble *max,
138
-+  gdouble *step,
139
-+  gdouble *page,
140
-+  gint *digits,
141
-+  gboolean *inverted);
142
-+//const gchar* ghb_get_rate_string(gint rate, gint type);
143
-+void ghb_combo_init(signal_user_data_t *ud);
144
-+void ghb_backend_init(gint debug);
145
-+void ghb_backend_close(void);
146
-+void ghb_add_job(GValue *js, gint unique_id);
147
-+void ghb_remove_job(gint unique_id);
148
-+void ghb_start_queue(void);
149
-+void ghb_stop_queue(void);
150
-+void ghb_pause_queue(void);
151
-+
152
-+void ghb_add_live_job(GValue *js, gint unique_id);
153
-+void ghb_start_live_encode();
154
-+void ghb_stop_live_encode();
155
-+
156
-+void ghb_clear_scan_state(gint state);
157
-+void ghb_clear_queue_state(gint state);
158
-+
159
-+void ghb_set_state(gint state);
160
-+gint ghb_get_scan_state();
161
-+gint ghb_get_queue_state();
162
-+void ghb_get_status(ghb_status_t *status);
163
-+void ghb_track_status(void);
164
-+void ghb_backend_scan(const gchar *path, gint titleindex, gint preview_count, guint64 min_duration);
165
-+void ghb_backend_scan_stop();
166
-+void ghb_backend_queue_scan(const gchar *path, gint titleindex);
167
-+gboolean ghb_get_title_info(ghb_title_info_t *tinfo, gint titleindex);
168
-+void ghb_par_init(signal_user_data_t *ud);
169
-+void ghb_set_scale(signal_user_data_t *ud, gint mode);
170
-+void ghb_set_scale_settings(GValue *settings, gint mode);
171
-+GValue* ghb_get_chapters(gint titleindex);
172
-+void ghb_get_chapter_duration(gint ti, gint ii, gint *hh, gint *mm, gint *ss);
173
-+void ghb_part_duration(gint tt, gint sc, gint ec, gint *hh, gint *mm, gint *ss);
174
-+gint ghb_get_best_mix(hb_audio_config_t *aconfig, gint acodec, gint mix);
175
-+gboolean ghb_ac3_in_audio_list(const GValue *audio_list);
176
-+gboolean ghb_audio_is_passthru(gint acodec);
177
-+gboolean ghb_audio_can_passthru(gint acodec);
178
-+gint ghb_get_default_acodec(void);
179
-+hb_audio_config_t* ghb_get_scan_audio_info(gint titleindex, gint audioindex);
180
-+void ghb_set_bitrate_opts(
181
-+  GtkBuilder *builder, gint first_rate, gint last_rate, gint extra_rate);
182
-+void ghb_grey_combo_options(signal_user_data_t *ud);
183
-+void ghb_update_ui_combo_box(
184
-+  signal_user_data_t *ud, const gchar *name, gint user_data, gboolean all);
185
-+gchar* ghb_get_source_audio_lang(gint titleindex, gint track);
186
-+gint ghb_find_audio_track(
187
-+  gint titleindex, const gchar *lang, gint acodec, 
188
-+  gint fallback_acodec, GHashTable *track_indices);
189
-+const gchar* ghb_audio_track_description(gint track, int titleindex);
190
-+void ghb_add_all_subtitles(signal_user_data_t *ud, gint titleindex);
191
-+gint ghb_find_pref_subtitle_track(const gchar *lang);
192
-+gint ghb_find_subtitle_track(
193
-+  gint titleindex, const gchar *lang, gboolean burn, 
194
-+  gboolean force, gint source, GHashTable *track_indices);
195
-+gint ghb_pick_subtitle_track(signal_user_data_t *ud);
196
-+gint ghb_find_cc_track(gint titleindex);
197
-+gint ghb_longest_title(void);
198
-+gchar* ghb_build_advanced_opts_string(GValue *settings);
199
-+GdkPixbuf* ghb_get_preview_image(
200
-+  gint titleindex, gint index, signal_user_data_t *ud,
201
-+  gint *width, gint *height);
202
-+gchar* ghb_dvd_volname(const gchar *device);
203
-+gint ghb_get_title_number(gint titleindex);
204
-+int ghb_get_title_count();
205
-+gint ghb_subtitle_track_source(GValue *settings, gint track);
206
-+const char* ghb_subtitle_track_source_name(GValue *settings, gint track);
207
-+const char* ghb_subtitle_source_name(gint source);
208
-+gchar* ghb_subtitle_track_lang(GValue *settings, gint track);
209
-+
210
-+gboolean ghb_validate_vquality(GValue *settings);
211
-+gboolean ghb_validate_audio(GValue *settings);
212
-+gboolean ghb_validate_subtitles(GValue *settings);
213
-+gboolean ghb_validate_video(GValue *settings);
214
-+gboolean ghb_validate_filters(GValue *settings);
215
-+gboolean ghb_validate_filter_string(const gchar *str, gint max_fields);
216
-+void ghb_hb_cleanup(gboolean partial);
217
-+gint ghb_lookup_combo_int(const gchar *name, const GValue *gval);
218
-+gdouble ghb_lookup_combo_double(const gchar *name, const GValue *gval);
219
-+const gchar* ghb_lookup_combo_option(const gchar *name, const GValue *gval);
220
-+const gchar* ghb_lookup_combo_string(const gchar *name, const GValue *gval);
221
-+gchar* ghb_get_tmp_dir();
222
-+gint ghb_find_closest_audio_rate(gint rate);
223
-+GValue* ghb_lookup_acodec_value(gint val);
224
-+
225
-+#endif // _HBBACKEND_H_
226
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/hb-backend.c HandBrake-0.9.8/gtk/src/hb-backend.c
227
---- HandBrake-0.9.8.orig/gtk/src/hb-backend.c  2012-06-08 22:39:42.000000000 +0200
228
-+++ HandBrake-0.9.8/gtk/src/hb-backend.c   2013-04-05 20:37:10.000000000 +0200
229
-@@ -24,10 +24,10 @@
230
- #define _GNU_SOURCE
231
- #include <limits.h>
232
- #include <math.h>
233
--#include "hb.h"
234
-+#include "handbrake.h"
235
- #include "ghbcompat.h"
236
- #include <glib/gstdio.h>
237
--#include "hb-backend.h"
238
-+#include "handbrake-backend.h"
239
- #include "settings.h"
240
- #include "callbacks.h"
241
- #include "subtitlehandler.h"
242
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/hb-backend.h HandBrake-0.9.8/gtk/src/hb-backend.h
243
---- HandBrake-0.9.8.orig/gtk/src/hb-backend.h  2011-10-16 19:33:20.000000000 +0200
244
-+++ HandBrake-0.9.8/gtk/src/hb-backend.h   1970-01-01 01:00:00.000000000 +0100
245
-@@ -1,184 +0,0 @@
246
--/*
247
-- * This program is free software; you can redistribute it and/or modify
248
-- * it under the terms of the GNU General Public License as published by
249
-- * the Free Software Foundation; either version 2 of the License, or
250
-- * (at your option) any later version.
251
-- * 
252
-- * This program is distributed in the hope that it will be useful,
253
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
254
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
255
-- * GNU Library General Public License for more details.
256
-- * 
257
-- * You should have received a copy of the GNU General Public License
258
-- * along with this program; if not, write to the Free Software
259
-- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
260
-- */
261
-- 
262
--#if !defined(_HBBACKEND_H_)
263
--#define _HBBACKEND_H_
264
--
265
--#include "settings.h"
266
--#include "hb.h"
267
--
268
--enum
269
--{
270
--  GHB_ERROR_NONE,
271
--  GHB_ERROR_CANCELED,
272
--  GHB_ERROR_FAIL,
273
--};
274
--
275
--typedef struct
276
--{
277
--  gint state;
278
--
279
--  // SCANNING
280
--  gint title_count;
281
--  gint title_cur;
282
--
283
--  // WORKING
284
--  gint unique_id;
285
--  gint job_cur;
286
--  gint job_count;
287
--  gdouble progress;
288
--  gdouble rate_cur;
289
--  gdouble rate_avg;
290
--  gint hours;
291
--  gint minutes;
292
--  gint seconds;
293
--  gint error;
294
--} ghb_instance_status_t;
295
--
296
--typedef struct
297
--{
298
--  ghb_instance_status_t scan;
299
--  ghb_instance_status_t queue;
300
--} ghb_status_t;
301
--
302
--#define GHB_PIC_KEEP_WIDTH          0x01
303
--#define GHB_PIC_KEEP_HEIGHT         0x02
304
--#define GHB_PIC_KEEP_DISPLAY_WIDTH  0x04
305
--#define GHB_PIC_KEEP_DISPLAY_HEIGHT 0x08
306
--#define GHB_PIC_KEEP_DAR            0x10
307
--#define GHB_PIC_KEEP_PAR            0x20
308
--#define GHB_PIC_USE_MAX             0x40
309
--
310
--typedef struct
311
--{
312
--  gchar *path;
313
--  gchar *name;
314
--  gint index;
315
--  gint type;
316
--  char *video_codec_name;
317
--  gint width;
318
--  gint height;
319
--  gint crop[4];
320
--  gint num_chapters;
321
--  gint rate;
322
--  gint rate_base;
323
--  gint interlaced;
324
--  gint aspect_n;
325
--  gint aspect_d;
326
--  gint hours;
327
--  gint minutes;
328
--  gint seconds;
329
--  gint64 duration;
330
--  gint angle_count;
331
--} ghb_title_info_t;
332
--
333
--#define GHB_AUDIO_SAMPLERATE 1
334
--#define GHB_AUDIO_BITRATE 2
335
--#define GHB_FRAMERATE 3
336
--
337
--const gchar* ghb_version(void);
338
--void ghb_vquality_range(
339
--  signal_user_data_t *ud, 
340
--  gdouble *min, 
341
--  gdouble *max,
342
--  gdouble *step,
343
--  gdouble *page,
344
--  gint *digits,
345
--  gboolean *inverted);
346
--//const gchar* ghb_get_rate_string(gint rate, gint type);
347
--void ghb_combo_init(signal_user_data_t *ud);
348
--void ghb_backend_init(gint debug);
349
--void ghb_backend_close(void);
350
--void ghb_add_job(GValue *js, gint unique_id);
351
--void ghb_remove_job(gint unique_id);
352
--void ghb_start_queue(void);
353
--void ghb_stop_queue(void);
354
--void ghb_pause_queue(void);
355
--
356
--void ghb_add_live_job(GValue *js, gint unique_id);
357
--void ghb_start_live_encode();
358
--void ghb_stop_live_encode();
359
--
360
--void ghb_clear_scan_state(gint state);
361
--void ghb_clear_queue_state(gint state);
362
--
363
--void ghb_set_state(gint state);
364
--gint ghb_get_scan_state();
365
--gint ghb_get_queue_state();
366
--void ghb_get_status(ghb_status_t *status);
367
--void ghb_track_status(void);
368
--void ghb_backend_scan(const gchar *path, gint titleindex, gint preview_count, guint64 min_duration);
369
--void ghb_backend_scan_stop();
370
--void ghb_backend_queue_scan(const gchar *path, gint titleindex);
371
--gboolean ghb_get_title_info(ghb_title_info_t *tinfo, gint titleindex);
372
--void ghb_par_init(signal_user_data_t *ud);
373
--void ghb_set_scale(signal_user_data_t *ud, gint mode);
374
--void ghb_set_scale_settings(GValue *settings, gint mode);
375
--GValue* ghb_get_chapters(gint titleindex);
376
--void ghb_get_chapter_duration(gint ti, gint ii, gint *hh, gint *mm, gint *ss);
377
--void ghb_part_duration(gint tt, gint sc, gint ec, gint *hh, gint *mm, gint *ss);
378
--gint ghb_get_best_mix(hb_audio_config_t *aconfig, gint acodec, gint mix);
379
--gboolean ghb_ac3_in_audio_list(const GValue *audio_list);
380
--gboolean ghb_audio_is_passthru(gint acodec);
381
--gboolean ghb_audio_can_passthru(gint acodec);
382
--gint ghb_get_default_acodec(void);
383
--hb_audio_config_t* ghb_get_scan_audio_info(gint titleindex, gint audioindex);
384
--void ghb_set_bitrate_opts(
385
--  GtkBuilder *builder, gint first_rate, gint last_rate, gint extra_rate);
386
--void ghb_grey_combo_options(signal_user_data_t *ud);
387
--void ghb_update_ui_combo_box(
388
--  signal_user_data_t *ud, const gchar *name, gint user_data, gboolean all);
389
--gchar* ghb_get_source_audio_lang(gint titleindex, gint track);
390
--gint ghb_find_audio_track(
391
--  gint titleindex, const gchar *lang, gint acodec, 
392
--  gint fallback_acodec, GHashTable *track_indices);
393
--const gchar* ghb_audio_track_description(gint track, int titleindex);
394
--void ghb_add_all_subtitles(signal_user_data_t *ud, gint titleindex);
395
--gint ghb_find_pref_subtitle_track(const gchar *lang);
396
--gint ghb_find_subtitle_track(
397
--  gint titleindex, const gchar *lang, gboolean burn, 
398
--  gboolean force, gint source, GHashTable *track_indices);
399
--gint ghb_pick_subtitle_track(signal_user_data_t *ud);
400
--gint ghb_find_cc_track(gint titleindex);
401
--gint ghb_longest_title(void);
402
--gchar* ghb_build_advanced_opts_string(GValue *settings);
403
--GdkPixbuf* ghb_get_preview_image(
404
--  gint titleindex, gint index, signal_user_data_t *ud,
405
--  gint *width, gint *height);
406
--gchar* ghb_dvd_volname(const gchar *device);
407
--gint ghb_get_title_number(gint titleindex);
408
--int ghb_get_title_count();
409
--gint ghb_subtitle_track_source(GValue *settings, gint track);
410
--const char* ghb_subtitle_track_source_name(GValue *settings, gint track);
411
--const char* ghb_subtitle_source_name(gint source);
412
--gchar* ghb_subtitle_track_lang(GValue *settings, gint track);
413
--
414
--gboolean ghb_validate_vquality(GValue *settings);
415
--gboolean ghb_validate_audio(GValue *settings);
416
--gboolean ghb_validate_subtitles(GValue *settings);
417
--gboolean ghb_validate_video(GValue *settings);
418
--gboolean ghb_validate_filters(GValue *settings);
419
--gboolean ghb_validate_filter_string(const gchar *str, gint max_fields);
420
--void ghb_hb_cleanup(gboolean partial);
421
--gint ghb_lookup_combo_int(const gchar *name, const GValue *gval);
422
--gdouble ghb_lookup_combo_double(const gchar *name, const GValue *gval);
423
--const gchar* ghb_lookup_combo_option(const gchar *name, const GValue *gval);
424
--const gchar* ghb_lookup_combo_string(const gchar *name, const GValue *gval);
425
--gchar* ghb_get_tmp_dir();
426
--gint ghb_find_closest_audio_rate(gint rate);
427
--GValue* ghb_lookup_acodec_value(gint val);
428
--
429
--#endif // _HBBACKEND_H_
430
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/main.c HandBrake-0.9.8/gtk/src/main.c
431
---- HandBrake-0.9.8.orig/gtk/src/main.c    2011-11-14 05:22:37.000000000 +0100
432
-+++ HandBrake-0.9.8/gtk/src/main.c 2013-04-05 20:37:10.000000000 +0200
433
-@@ -53,9 +53,9 @@
434
- 
435
- #include <glib/gstdio.h>
436
- #include <gio/gio.h>
437
--#include "hb.h"
438
-+#include "handbrake.h"
439
- #include "renderer_button.h"
440
--#include "hb-backend.h"
441
-+#include "handbrake-backend.h"
442
- #include "ghb-dvd.h"
443
- #include "ghbcellrenderertext.h"
444
- #include "values.h"
445
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/presets.c HandBrake-0.9.8/gtk/src/presets.c
446
---- HandBrake-0.9.8.orig/gtk/src/presets.c 2012-07-17 19:40:33.000000000 +0200
447
-+++ HandBrake-0.9.8/gtk/src/presets.c  2013-04-05 20:37:10.000000000 +0200
448
-@@ -20,12 +20,12 @@
449
- #include <glib/gstdio.h>
450
- #include <string.h>
451
- #include "ghbcompat.h"
452
--#include "hb.h"
453
-+#include "handbrake.h"
454
- #include "settings.h"
455
- #include "callbacks.h"
456
- #include "audiohandler.h"
457
- #include "subtitlehandler.h"
458
--#include "hb-backend.h"
459
-+#include "handbrake-backend.h"
460
- #include "plist.h"
461
- #include "resources.h"
462
- #include "presets.h"
463
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/preview.c HandBrake-0.9.8/gtk/src/preview.c
464
---- HandBrake-0.9.8.orig/gtk/src/preview.c 2011-06-03 17:55:00.000000000 +0200
465
-+++ HandBrake-0.9.8/gtk/src/preview.c  2013-04-05 20:37:10.000000000 +0200
466
-@@ -31,10 +31,10 @@
467
- #include "settings.h"
468
- #include "presets.h"
469
- #include "callbacks.h"
470
--#include "hb-backend.h"
471
-+#include "handbrake-backend.h"
472
- #include "preview.h"
473
- #include "values.h"
474
--#include "hb.h"
475
-+#include "handbrake.h"
476
- 
477
- #define PREVIEW_STATE_IMAGE 0
478
- #define PREVIEW_STATE_LIVE 1
479
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/queuehandler.c HandBrake-0.9.8/gtk/src/queuehandler.c
480
---- HandBrake-0.9.8.orig/gtk/src/queuehandler.c    2012-03-31 17:37:30.000000000 +0200
481
-+++ HandBrake-0.9.8/gtk/src/queuehandler.c 2013-04-05 20:37:10.000000000 +0200
482
-@@ -14,9 +14,9 @@
483
- #include "ghbcompat.h"
484
- #include <glib/gstdio.h>
485
- #include <gio/gio.h>
486
--#include "hb.h"
487
-+#include "handbrake.h"
488
- #include "settings.h"
489
--#include "hb-backend.h"
490
-+#include "handbrake-backend.h"
491
- #include "values.h"
492
- #include "callbacks.h"
493
- #include "presets.h"
494
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/settings.c HandBrake-0.9.8/gtk/src/settings.c
495
---- HandBrake-0.9.8.orig/gtk/src/settings.c    2011-10-16 19:33:20.000000000 +0200
496
-+++ HandBrake-0.9.8/gtk/src/settings.c 2013-04-05 20:37:10.000000000 +0200
497
-@@ -18,7 +18,7 @@
498
- #include <string.h>
499
- #include "ghbcompat.h"
500
- #include "settings.h"
501
--#include "hb-backend.h"
502
-+#include "handbrake-backend.h"
503
- #include "values.h"
504
- 
505
- void dump_settings(GValue *settings);
506
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/subtitlehandler.c HandBrake-0.9.8/gtk/src/subtitlehandler.c
507
---- HandBrake-0.9.8.orig/gtk/src/subtitlehandler.c 2011-10-16 19:33:20.000000000 +0200
508
-+++ HandBrake-0.9.8/gtk/src/subtitlehandler.c  2013-04-05 20:37:10.000000000 +0200
509
-@@ -12,9 +12,9 @@
510
-  */
511
- 
512
- #include "ghbcompat.h"
513
--#include "hb.h"
514
-+#include "handbrake.h"
515
- #include "settings.h"
516
--#include "hb-backend.h"
517
-+#include "handbrake-backend.h"
518
- #include "values.h"
519
- #include "callbacks.h"
520
- #include "preview.h"
521
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/x264handler.c HandBrake-0.9.8/gtk/src/x264handler.c
522
---- HandBrake-0.9.8.orig/gtk/src/x264handler.c 2011-08-03 17:02:49.000000000 +0200
523
-+++ HandBrake-0.9.8/gtk/src/x264handler.c  2013-04-05 20:37:10.000000000 +0200
524
-@@ -17,7 +17,7 @@
525
- #include "values.h"
526
- #include "callbacks.h"
527
- #include "presets.h"
528
--#include "hb-backend.h"
529
-+#include "handbrake-backend.h"
530
- #include "x264handler.h"
531
- 
532
- gint ghb_lookup_bframes(const gchar *options);
533
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/batch.c HandBrake-0.9.8/libhb/batch.c
534
---- HandBrake-0.9.8.orig/libhb/batch.c 2011-07-27 17:09:49.000000000 +0200
535
-+++ HandBrake-0.9.8/libhb/batch.c  2013-04-05 20:10:38.000000000 +0200
536
-@@ -4,7 +4,7 @@
537
-    Homepage: <http://handbrake.fr/>.
538
-    It may be used under the terms of the GNU General Public License. */
539
- 
540
--#include "hb.h"
541
-+#include "handbrake.h"
542
- #include "lang.h"
543
- 
544
- struct hb_batch_s
545
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/bd.c HandBrake-0.9.8/libhb/bd.c
546
---- HandBrake-0.9.8.orig/libhb/bd.c    2011-09-19 17:35:46.000000000 +0200
547
-+++ HandBrake-0.9.8/libhb/bd.c 2013-04-05 20:10:38.000000000 +0200
548
-@@ -4,7 +4,7 @@
549
-    Homepage: <http://handbrake.fr/>.
550
-    It may be used under the terms of the GNU General Public License. */
551
- 
552
--#include "hb.h"
553
-+#include "handbrake.h"
554
- #include "lang.h"
555
- #include "hbffmpeg.h"
556
- 
557
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/common.c HandBrake-0.9.8/libhb/common.c
558
---- HandBrake-0.9.8.orig/libhb/common.c    2012-03-19 23:02:23.000000000 +0100
559
-+++ HandBrake-0.9.8/libhb/common.c 2013-04-05 20:10:38.000000000 +0200
560
-@@ -11,7 +11,7 @@
561
- 
562
- #include "common.h"
563
- #include "lang.h"
564
--#include "hb.h"
565
-+#include "handbrake.h"
566
- 
567
- /**********************************************************************
568
-  * Global variables
569
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/deblock.c HandBrake-0.9.8/libhb/deblock.c
570
---- HandBrake-0.9.8.orig/libhb/deblock.c   2008-12-13 07:55:01.000000000 +0100
571
-+++ HandBrake-0.9.8/libhb/deblock.c    2013-04-05 20:10:38.000000000 +0200
572
-@@ -16,7 +16,7 @@
573
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
574
- */
575
- 
576
--#include "hb.h"
577
-+#include "handbrake.h"
578
- #include "hbffmpeg.h"
579
- #include "mpeg2dec/mpeg2.h"
580
- 
581
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/deca52.c HandBrake-0.9.8/libhb/deca52.c
582
---- HandBrake-0.9.8.orig/libhb/deca52.c    2012-05-01 12:08:03.000000000 +0200
583
-+++ HandBrake-0.9.8/libhb/deca52.c 2013-04-05 20:10:38.000000000 +0200
584
-@@ -4,7 +4,7 @@
585
-    Homepage: <http://handbrake.fr/>.
586
-    It may be used under the terms of the GNU General Public License. */
587
- 
588
--#include "hb.h"
589
-+#include "handbrake.h"
590
- #include "downmix.h"
591
- 
592
- #include "a52dec/a52.h"
593
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decavcodec.c HandBrake-0.9.8/libhb/decavcodec.c
594
---- HandBrake-0.9.8.orig/libhb/decavcodec.c    2012-07-17 00:37:08.000000000 +0200
595
-+++ HandBrake-0.9.8/libhb/decavcodec.c 2013-04-05 20:10:38.000000000 +0200
596
-@@ -35,7 +35,7 @@
597
-     VC1 decoder) can't easily be used by the HB mpeg stream reader.
598
-  */
599
- 
600
--#include "hb.h"
601
-+#include "handbrake.h"
602
- #include "hbffmpeg.h"
603
- #include "downmix.h"
604
- #include "libavcodec/audioconvert.h"
605
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/deccc608sub.c HandBrake-0.9.8/libhb/deccc608sub.c
606
---- HandBrake-0.9.8.orig/libhb/deccc608sub.c   2010-05-30 19:08:12.000000000 +0200
607
-+++ HandBrake-0.9.8/libhb/deccc608sub.c    2013-04-05 20:10:38.000000000 +0200
608
-@@ -4,7 +4,7 @@
609
-  *
610
-  * Note that the SRT sub generation from CC could be useful for mkv subs.
611
-  */
612
--#include "hb.h"
613
-+#include "handbrake.h"
614
- #include "deccc608sub.h"
615
- 
616
- /*
617
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decdca.c HandBrake-0.9.8/libhb/decdca.c
618
---- HandBrake-0.9.8.orig/libhb/decdca.c    2012-05-01 12:08:03.000000000 +0200
619
-+++ HandBrake-0.9.8/libhb/decdca.c 2013-04-05 20:10:38.000000000 +0200
620
-@@ -4,7 +4,7 @@
621
-    Homepage: <http://handbrake.fr/>.
622
-    It may be used under the terms of the GNU General Public License. */
623
- 
624
--#include "hb.h"
625
-+#include "handbrake.h"
626
- #include "downmix.h"
627
- 
628
- #include "dca.h"
629
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/declpcm.c HandBrake-0.9.8/libhb/declpcm.c
630
---- HandBrake-0.9.8.orig/libhb/declpcm.c   2012-05-01 12:08:03.000000000 +0200
631
-+++ HandBrake-0.9.8/libhb/declpcm.c    2013-04-05 20:10:38.000000000 +0200
632
-@@ -4,7 +4,7 @@
633
-    Homepage: <http://handbrake.fr/>.
634
-    It may be used under the terms of the GNU General Public License. */
635
- 
636
--#include "hb.h"
637
-+#include "handbrake.h"
638
- #include "downmix.h"
639
- 
640
- struct hb_work_private_s
641
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decmpeg2.c HandBrake-0.9.8/libhb/decmpeg2.c
642
---- HandBrake-0.9.8.orig/libhb/decmpeg2.c  2011-11-11 00:29:23.000000000 +0100
643
-+++ HandBrake-0.9.8/libhb/decmpeg2.c   2013-04-05 20:10:38.000000000 +0200
644
-@@ -4,7 +4,7 @@
645
-    Homepage: <http://handbrake.fr/>.
646
-    It may be used under the terms of the GNU General Public License. */
647
- 
648
--#include "hb.h"
649
-+#include "handbrake.h"
650
- #include "hbffmpeg.h"
651
- #include "mpeg2dec/mpeg2.h"
652
- 
653
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decomb.c HandBrake-0.9.8/libhb/decomb.c
654
---- HandBrake-0.9.8.orig/libhb/decomb.c    2012-07-07 01:13:03.000000000 +0200
655
-+++ HandBrake-0.9.8/libhb/decomb.c 2013-04-05 20:10:38.000000000 +0200
656
-@@ -74,7 +74,7 @@
657
- 16: DOES NOT WORK BY ITSELF-- mcdeint needs to be fed by another deinterlacer
658
- *****/
659
- 
660
--#include "hb.h"
661
-+#include "handbrake.h"
662
- #include "hbffmpeg.h"
663
- #include "mpeg2dec/mpeg2.h"
664
- #include "eedi2.h"
665
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decsrtsub.c HandBrake-0.9.8/libhb/decsrtsub.c
666
---- HandBrake-0.9.8.orig/libhb/decsrtsub.c 2010-06-02 01:02:41.000000000 +0200
667
-+++ HandBrake-0.9.8/libhb/decsrtsub.c  2013-04-05 20:10:38.000000000 +0200
668
-@@ -8,7 +8,7 @@
669
- #include <string.h>
670
- #include <iconv.h>
671
- #include <errno.h>
672
--#include "hb.h"
673
-+#include "handbrake.h"
674
- 
675
- struct start_and_end {
676
-     unsigned long start, end;
677
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decssasub.c HandBrake-0.9.8/libhb/decssasub.c
678
---- HandBrake-0.9.8.orig/libhb/decssasub.c 2011-09-24 20:42:05.000000000 +0200
679
-+++ HandBrake-0.9.8/libhb/decssasub.c  2013-04-05 20:10:38.000000000 +0200
680
-@@ -21,7 +21,7 @@
681
-  */
682
- #include <stdlib.h>
683
- #include <stdio.h>
684
--#include "hb.h"
685
-+#include "handbrake.h"
686
- 
687
- #include <ass/ass.h>
688
- 
689
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/dectx3gsub.c HandBrake-0.9.8/libhb/dectx3gsub.c
690
---- HandBrake-0.9.8.orig/libhb/dectx3gsub.c    2010-06-01 22:21:49.000000000 +0200
691
-+++ HandBrake-0.9.8/libhb/dectx3gsub.c 2013-04-05 20:10:38.000000000 +0200
692
-@@ -15,7 +15,7 @@
693
- 
694
- #include <stdlib.h>
695
- #include <stdio.h>
696
--#include "hb.h"
697
-+#include "handbrake.h"
698
- 
699
- typedef enum {
700
-     BOLD        = 0x1,
701
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decutf8sub.c HandBrake-0.9.8/libhb/decutf8sub.c
702
---- HandBrake-0.9.8.orig/libhb/decutf8sub.c    2010-05-04 18:56:43.000000000 +0200
703
-+++ HandBrake-0.9.8/libhb/decutf8sub.c 2013-04-05 20:10:38.000000000 +0200
704
-@@ -14,7 +14,7 @@
705
- 
706
- #include <stdlib.h>
707
- #include <stdio.h>
708
--#include "hb.h"
709
-+#include "handbrake.h"
710
- 
711
- static int decutf8Init( hb_work_object_t * w, hb_job_t * job )
712
- {
713
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/decvobsub.c HandBrake-0.9.8/libhb/decvobsub.c
714
---- HandBrake-0.9.8.orig/libhb/decvobsub.c 2011-12-22 17:36:51.000000000 +0100
715
-+++ HandBrake-0.9.8/libhb/decvobsub.c  2013-04-05 20:10:38.000000000 +0200
716
-@@ -24,7 +24,7 @@
717
-  *   }
718
-  */
719
- 
720
--#include "hb.h"
721
-+#include "handbrake.h"
722
- 
723
- struct hb_work_private_s
724
- {
725
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/deinterlace.c HandBrake-0.9.8/libhb/deinterlace.c
726
---- HandBrake-0.9.8.orig/libhb/deinterlace.c   2012-06-25 09:49:25.000000000 +0200
727
-+++ HandBrake-0.9.8/libhb/deinterlace.c    2013-04-05 20:10:38.000000000 +0200
728
-@@ -16,7 +16,7 @@
729
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
730
- */
731
- 
732
--#include "hb.h"
733
-+#include "handbrake.h"
734
- #include "hbffmpeg.h"
735
- #include "mpeg2dec/mpeg2.h"
736
- #include "mcdeint.h"
737
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/demuxmpeg.c HandBrake-0.9.8/libhb/demuxmpeg.c
738
---- HandBrake-0.9.8.orig/libhb/demuxmpeg.c 2012-03-18 21:03:10.000000000 +0100
739
-+++ HandBrake-0.9.8/libhb/demuxmpeg.c  2013-04-05 20:10:38.000000000 +0200
740
-@@ -4,7 +4,7 @@
741
-    Homepage: <http://handbrake.fr/>.
742
-    It may be used under the terms of the GNU General Public License. */
743
- 
744
--#include "hb.h"
745
-+#include "handbrake.h"
746
- 
747
- static inline void check_mpeg_scr( hb_psdemux_t *state, int64_t scr, int tol )
748
- {
749
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/denoise.c HandBrake-0.9.8/libhb/denoise.c
750
---- HandBrake-0.9.8.orig/libhb/denoise.c   2008-12-13 07:55:01.000000000 +0100
751
-+++ HandBrake-0.9.8/libhb/denoise.c    2013-04-05 20:10:38.000000000 +0200
752
-@@ -16,7 +16,7 @@
753
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
754
- */
755
- 
756
--#include "hb.h"
757
-+#include "handbrake.h"
758
- #include "hbffmpeg.h"
759
- #include "mpeg2dec/mpeg2.h"
760
- 
761
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/detelecine.c HandBrake-0.9.8/libhb/detelecine.c
762
---- HandBrake-0.9.8.orig/libhb/detelecine.c    2009-10-31 16:09:22.000000000 +0100
763
-+++ HandBrake-0.9.8/libhb/detelecine.c 2013-04-05 20:10:38.000000000 +0200
764
-@@ -1,4 +1,4 @@
765
--#include "hb.h"
766
-+#include "handbrake.h"
767
- #include "hbffmpeg.h"
768
- #include "mpeg2dec/mpeg2.h"
769
- 
770
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/dvd.c HandBrake-0.9.8/libhb/dvd.c
771
---- HandBrake-0.9.8.orig/libhb/dvd.c   2012-05-01 13:24:28.000000000 +0200
772
-+++ HandBrake-0.9.8/libhb/dvd.c    2013-04-05 20:10:38.000000000 +0200
773
-@@ -4,7 +4,7 @@
774
-    Homepage: <http://handbrake.fr/>.
775
-    It may be used under the terms of the GNU General Public License. */
776
- 
777
--#include "hb.h"
778
-+#include "handbrake.h"
779
- #include "lang.h"
780
- #include "dvd.h"
781
- 
782
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/dvdnav.c HandBrake-0.9.8/libhb/dvdnav.c
783
---- HandBrake-0.9.8.orig/libhb/dvdnav.c    2011-09-26 22:37:46.000000000 +0200
784
-+++ HandBrake-0.9.8/libhb/dvdnav.c 2013-04-05 20:10:38.000000000 +0200
785
-@@ -4,7 +4,7 @@
786
-    Homepage: <http://handbrake.fr/>.
787
-    It may be used under the terms of the GNU General Public License. */
788
- 
789
--#include "hb.h"
790
-+#include "handbrake.h"
791
- #include "lang.h"
792
- #include "dvd.h"
793
- 
794
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/eedi2.c HandBrake-0.9.8/libhb/eedi2.c
795
---- HandBrake-0.9.8.orig/libhb/eedi2.c 2009-03-19 18:30:56.000000000 +0100
796
-+++ HandBrake-0.9.8/libhb/eedi2.c  2013-04-05 20:10:38.000000000 +0200
797
-@@ -8,7 +8,7 @@
798
-    http://web.missouri.edu/~kes25c/
799
- */
800
- 
801
--#include "hb.h"
802
-+#include "handbrake.h"
803
- #include "eedi2.h"
804
- 
805
- /**
806
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/encavcodec.c HandBrake-0.9.8/libhb/encavcodec.c
807
---- HandBrake-0.9.8.orig/libhb/encavcodec.c    2011-10-15 23:32:20.000000000 +0200
808
-+++ HandBrake-0.9.8/libhb/encavcodec.c 2013-04-05 20:10:38.000000000 +0200
809
-@@ -4,7 +4,7 @@
810
-    Homepage: <http://handbrake.fr/>.
811
-    It may be used under the terms of the GNU General Public License. */
812
- 
813
--#include "hb.h"
814
-+#include "handbrake.h"
815
- #include "hbffmpeg.h"
816
- 
817
- /*
818
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/encavcodecaudio.c HandBrake-0.9.8/libhb/encavcodecaudio.c
819
---- HandBrake-0.9.8.orig/libhb/encavcodecaudio.c   2012-07-17 00:37:08.000000000 +0200
820
-+++ HandBrake-0.9.8/libhb/encavcodecaudio.c    2013-04-05 20:10:38.000000000 +0200
821
-@@ -4,7 +4,7 @@
822
-    Homepage: <http://handbrake.fr/>.
823
-    It may be used under the terms of the GNU General Public License. */
824
- 
825
--#include "hb.h"
826
-+#include "handbrake.h"
827
- #include "hbffmpeg.h"
828
- #include "downmix.h"
829
- #include "libavcodec/audioconvert.h"
830
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/encfaac.c HandBrake-0.9.8/libhb/encfaac.c
831
---- HandBrake-0.9.8.orig/libhb/encfaac.c   2011-10-12 22:19:33.000000000 +0200
832
-+++ HandBrake-0.9.8/libhb/encfaac.c    2013-04-05 20:10:38.000000000 +0200
833
-@@ -4,7 +4,7 @@
834
-    Homepage: <http://handbrake.fr/>.
835
-    It may be used under the terms of the GNU General Public License. */
836
- 
837
--#include "hb.h"
838
-+#include "handbrake.h"
839
- 
840
- #include "faac.h"
841
- 
842
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/enclame.c HandBrake-0.9.8/libhb/enclame.c
843
---- HandBrake-0.9.8.orig/libhb/enclame.c   2011-10-12 22:19:33.000000000 +0200
844
-+++ HandBrake-0.9.8/libhb/enclame.c    2013-04-05 20:10:38.000000000 +0200
845
-@@ -4,7 +4,7 @@
846
-    Homepage: <http://handbrake.fr/>.
847
-    It may be used under the terms of the GNU General Public License. */
848
- 
849
--#include "hb.h"
850
-+#include "handbrake.h"
851
- 
852
- #include "lame/lame.h"
853
- 
854
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/enctheora.c HandBrake-0.9.8/libhb/enctheora.c
855
---- HandBrake-0.9.8.orig/libhb/enctheora.c 2011-03-21 03:20:48.000000000 +0100
856
-+++ HandBrake-0.9.8/libhb/enctheora.c  2013-04-05 20:10:38.000000000 +0200
857
-@@ -2,7 +2,7 @@
858
-    Homepage: <http://handbrake.fr/>.
859
-    It may be used under the terms of the GNU General Public License. */
860
- 
861
--#include "hb.h"
862
-+#include "handbrake.h"
863
- #include "theora/codec.h"
864
- #include "theora/theoraenc.h"
865
- 
866
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/encvobsub.c HandBrake-0.9.8/libhb/encvobsub.c
867
---- HandBrake-0.9.8.orig/libhb/encvobsub.c 2009-05-20 00:27:11.000000000 +0200
868
-+++ HandBrake-0.9.8/libhb/encvobsub.c  2013-04-05 20:10:38.000000000 +0200
869
-@@ -4,7 +4,7 @@
870
-    Homepage: <http://handbrake.fr/>.
871
-    It may be used under the terms of the GNU General Public License. */
872
- 
873
--#include "hb.h"
874
-+#include "handbrake.h"
875
- 
876
- struct hb_work_private_s
877
- {
878
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/encvorbis.c HandBrake-0.9.8/libhb/encvorbis.c
879
---- HandBrake-0.9.8.orig/libhb/encvorbis.c 2012-02-22 00:56:12.000000000 +0100
880
-+++ HandBrake-0.9.8/libhb/encvorbis.c  2013-04-05 20:10:38.000000000 +0200
881
-@@ -4,7 +4,7 @@
882
-    Homepage: <http://handbrake.fr/>.
883
-    It may be used under the terms of the GNU General Public License. */
884
- 
885
--#include "hb.h"
886
-+#include "handbrake.h"
887
- 
888
- #include "vorbis/vorbisenc.h"
889
- 
890
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/encx264.c HandBrake-0.9.8/libhb/encx264.c
891
---- HandBrake-0.9.8.orig/libhb/encx264.c   2011-10-02 23:28:45.000000000 +0200
892
-+++ HandBrake-0.9.8/libhb/encx264.c    2013-04-05 20:10:38.000000000 +0200
893
-@@ -6,7 +6,7 @@
894
- 
895
- #include <stdarg.h>
896
- 
897
--#include "hb.h"
898
-+#include "handbrake.h"
899
- 
900
- #include "x264.h"
901
- 
902
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/fifo.c HandBrake-0.9.8/libhb/fifo.c
903
---- HandBrake-0.9.8.orig/libhb/fifo.c  2011-12-21 23:07:05.000000000 +0100
904
-+++ HandBrake-0.9.8/libhb/fifo.c   2013-04-05 20:10:38.000000000 +0200
905
-@@ -4,7 +4,7 @@
906
-    Homepage: <http://handbrake.fr/>.
907
-    It may be used under the terms of the GNU General Public License. */
908
- 
909
--#include "hb.h"
910
-+#include "handbrake.h"
911
- 
912
- #ifndef SYS_DARWIN
913
- #include <malloc.h>
914
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/handbrake.h HandBrake-0.9.8/libhb/handbrake.h
915
---- HandBrake-0.9.8.orig/libhb/handbrake.h 1970-01-01 01:00:00.000000000 +0100
916
-+++ HandBrake-0.9.8/libhb/handbrake.h  2012-07-07 01:29:10.000000000 +0200
917
-@@ -0,0 +1,126 @@
918
-+#ifndef HB_HB_H
919
-+#define HB_HB_H
920
-+
921
-+#ifdef __cplusplus
922
-+extern "C" {
923
-+#endif
924
-+
925
-+#include "project.h"
926
-+#include "common.h"
927
-+
928
-+#ifdef __APPLE__
929
-+#include <CoreServices/CoreServices.h> // for Gestalt
930
-+#include <AudioToolbox/AudioToolbox.h>
931
-+#include <dlfcn.h>
932
-+#endif
933
-+/* Whether the Core Audio HE-AAC encoder is available on the system. */
934
-+int encca_haac_available();
935
-+
936
-+/* hb_init()
937
-+   Initializes a libhb session (launches his own thread, detects CPUs,
938
-+   etc) */
939
-+#define HB_DEBUG_NONE 0
940
-+#define HB_DEBUG_ALL  1
941
-+void          hb_register( hb_work_object_t * );
942
-+void          hb_register_logger( void (*log_cb)(const char* message) );
943
-+hb_handle_t * hb_init( int verbose, int update_check );
944
-+hb_handle_t * hb_init_dl ( int verbose, int update_check ); // hb_init for use with dylib
945
-+
946
-+/* hb_get_version() */
947
-+char        * hb_get_version( hb_handle_t * );
948
-+int           hb_get_build( hb_handle_t * );
949
-+
950
-+/* hb_check_update()
951
-+   Checks for an update on the website. If there is, returns the build
952
-+   number and points 'version' to a version description. Returns a
953
-+   negative value otherwise. */
954
-+int           hb_check_update( hb_handle_t * h, char ** version );
955
-+
956
-+
957
-+char *        hb_dvd_name( char * path );
958
-+void          hb_dvd_set_dvdnav( int enable );
959
-+
960
-+/* hb_scan()
961
-+   Scan the specified path. Can be a DVD device, a VIDEO_TS folder or
962
-+   a VOB file. If title_index is 0, scan all titles. */
963
-+void          hb_scan( hb_handle_t *, const char * path,
964
-+                       int title_index, int preview_count,
965
-+                       int store_previews, uint64_t min_duration );
966
-+void          hb_scan_stop( hb_handle_t * );
967
-+hb_filter_object_t * hb_get_filter_object(int filter_id, const char * settings);
968
-+uint64_t      hb_first_duration( hb_handle_t * );
969
-+
970
-+/* hb_get_titles()
971
-+   Returns the list of valid titles detected by the latest scan. */
972
-+hb_list_t   * hb_get_titles( hb_handle_t * );
973
-+
974
-+/* hb_detect_comb()
975
-+   Analyze a frame for interlacing artifacts, returns true if they're found.
976
-+   Taken from Thomas Oestreich's 32detect filter in the Transcode project.  */
977
-+int hb_detect_comb( hb_buffer_t * buf, int color_equal, int color_diff, int threshold, int prog_equal, int prog_diff, int prog_threshold );
978
-+
979
-+void          hb_get_preview_by_index( hb_handle_t *, int, int, uint8_t * );
980
-+void          hb_get_preview( hb_handle_t *, hb_title_t *, int,
981
-+                              uint8_t * );
982
-+void          hb_set_size( hb_job_t *, double ratio, int pixels );
983
-+void          hb_set_anamorphic_size_by_index( hb_handle_t *, int,
984
-+                int *output_width, int *output_height,
985
-+                int *output_par_width, int *output_par_height );
986
-+void          hb_set_anamorphic_size( hb_job_t *,
987
-+                int *output_width, int *output_height,
988
-+                int *output_par_width, int *output_par_height );
989
-+
990
-+/* Handling jobs */
991
-+int           hb_count( hb_handle_t * );
992
-+hb_job_t *    hb_job( hb_handle_t *, int );
993
-+void          hb_set_chapter_name( hb_handle_t *, int, int, const char * );
994
-+void          hb_set_job( hb_handle_t *, int, hb_job_t * );
995
-+void          hb_add( hb_handle_t *, hb_job_t * );
996
-+void          hb_rem( hb_handle_t *, hb_job_t * );
997
-+
998
-+void          hb_start( hb_handle_t * );
999
-+void          hb_pause( hb_handle_t * );
1000
-+void          hb_resume( hb_handle_t * );
1001
-+void          hb_stop( hb_handle_t * );
1002
-+
1003
-+/* Persistent data between jobs. */
1004
-+typedef struct hb_interjob_s
1005
-+{
1006
-+    int last_job;          /* job->sequence_id & 0xFFFFFF */
1007
-+    int frame_count;       /* number of frames counted by sync */
1008
-+    int out_frame_count;   /* number of frames counted by render */
1009
-+    uint64_t total_time;   /* real length in 90kHz ticks (i.e. seconds / 90000) */
1010
-+    int vrate;             /* actual measured output vrate from 1st pass */
1011
-+    int vrate_base;        /* actual measured output vrate_base from 1st pass */
1012
-+
1013
-+    hb_subtitle_t *select_subtitle; /* foreign language scan subtitle */
1014
-+} hb_interjob_t;
1015
-+
1016
-+hb_interjob_t * hb_interjob_get( hb_handle_t * ); 
1017
-+
1018
-+/* hb_get_state()
1019
-+   Should be regularly called by the UI (like 5 or 10 times a second).
1020
-+   Look at test/test.c to see how to use it. */
1021
-+void hb_get_state( hb_handle_t *, hb_state_t * );
1022
-+void hb_get_state2( hb_handle_t *, hb_state_t * );
1023
-+/* hb_get_scancount() is called by the MacGui in UpdateUI to
1024
-+   check for a new scan during HB_STATE_WORKING phase  */
1025
-+int hb_get_scancount( hb_handle_t * );
1026
-+
1027
-+/* hb_close()
1028
-+   Aborts all current jobs if any, frees memory. */
1029
-+void          hb_close( hb_handle_t ** );
1030
-+
1031
-+/* hb_global_close()
1032
-+   Performs final cleanup for the process. */
1033
-+void          hb_global_close();
1034
-+
1035
-+/* hb_get_instance_id()
1036
-+   Return the unique instance id of an libhb instance created by hb_init. */
1037
-+int hb_get_instance_id( hb_handle_t * h );
1038
-+
1039
-+#ifdef __cplusplus
1040
-+}
1041
-+#endif
1042
-+
1043
-+#endif
1044
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/hb.c HandBrake-0.9.8/libhb/hb.c
1045
---- HandBrake-0.9.8.orig/libhb/hb.c    2012-07-07 01:29:10.000000000 +0200
1046
-+++ HandBrake-0.9.8/libhb/hb.c 2013-04-05 20:10:38.000000000 +0200
1047
-@@ -1,4 +1,4 @@
1048
--#include "hb.h"
1049
-+#include "handbrake.h"
1050
- #include "hbffmpeg.h"
1051
- #include <stdio.h>
1052
- #include <unistd.h>
1053
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/hb.h HandBrake-0.9.8/libhb/hb.h
1054
---- HandBrake-0.9.8.orig/libhb/hb.h    2012-07-07 01:29:10.000000000 +0200
1055
-+++ HandBrake-0.9.8/libhb/hb.h 1970-01-01 01:00:00.000000000 +0100
1056
-@@ -1,126 +0,0 @@
1057
--#ifndef HB_HB_H
1058
--#define HB_HB_H
1059
--
1060
--#ifdef __cplusplus
1061
--extern "C" {
1062
--#endif
1063
--
1064
--#include "project.h"
1065
--#include "common.h"
1066
--
1067
--#ifdef __APPLE__
1068
--#include <CoreServices/CoreServices.h> // for Gestalt
1069
--#include <AudioToolbox/AudioToolbox.h>
1070
--#include <dlfcn.h>
1071
--#endif
1072
--/* Whether the Core Audio HE-AAC encoder is available on the system. */
1073
--int encca_haac_available();
1074
--
1075
--/* hb_init()
1076
--   Initializes a libhb session (launches his own thread, detects CPUs,
1077
--   etc) */
1078
--#define HB_DEBUG_NONE 0
1079
--#define HB_DEBUG_ALL  1
1080
--void          hb_register( hb_work_object_t * );
1081
--void          hb_register_logger( void (*log_cb)(const char* message) );
1082
--hb_handle_t * hb_init( int verbose, int update_check );
1083
--hb_handle_t * hb_init_dl ( int verbose, int update_check ); // hb_init for use with dylib
1084
--
1085
--/* hb_get_version() */
1086
--char        * hb_get_version( hb_handle_t * );
1087
--int           hb_get_build( hb_handle_t * );
1088
--
1089
--/* hb_check_update()
1090
--   Checks for an update on the website. If there is, returns the build
1091
--   number and points 'version' to a version description. Returns a
1092
--   negative value otherwise. */
1093
--int           hb_check_update( hb_handle_t * h, char ** version );
1094
--
1095
--
1096
--char *        hb_dvd_name( char * path );
1097
--void          hb_dvd_set_dvdnav( int enable );
1098
--
1099
--/* hb_scan()
1100
--   Scan the specified path. Can be a DVD device, a VIDEO_TS folder or
1101
--   a VOB file. If title_index is 0, scan all titles. */
1102
--void          hb_scan( hb_handle_t *, const char * path,
1103
--                       int title_index, int preview_count,
1104
--                       int store_previews, uint64_t min_duration );
1105
--void          hb_scan_stop( hb_handle_t * );
1106
--hb_filter_object_t * hb_get_filter_object(int filter_id, const char * settings);
1107
--uint64_t      hb_first_duration( hb_handle_t * );
1108
--
1109
--/* hb_get_titles()
1110
--   Returns the list of valid titles detected by the latest scan. */
1111
--hb_list_t   * hb_get_titles( hb_handle_t * );
1112
--
1113
--/* hb_detect_comb()
1114
--   Analyze a frame for interlacing artifacts, returns true if they're found.
1115
--   Taken from Thomas Oestreich's 32detect filter in the Transcode project.  */
1116
--int hb_detect_comb( hb_buffer_t * buf, int color_equal, int color_diff, int threshold, int prog_equal, int prog_diff, int prog_threshold );
1117
--
1118
--void          hb_get_preview_by_index( hb_handle_t *, int, int, uint8_t * );
1119
--void          hb_get_preview( hb_handle_t *, hb_title_t *, int,
1120
--                              uint8_t * );
1121
--void          hb_set_size( hb_job_t *, double ratio, int pixels );
1122
--void          hb_set_anamorphic_size_by_index( hb_handle_t *, int,
1123
--                int *output_width, int *output_height,
1124
--                int *output_par_width, int *output_par_height );
1125
--void          hb_set_anamorphic_size( hb_job_t *,
1126
--                int *output_width, int *output_height,
1127
--                int *output_par_width, int *output_par_height );
1128
--
1129
--/* Handling jobs */
1130
--int           hb_count( hb_handle_t * );
1131
--hb_job_t *    hb_job( hb_handle_t *, int );
1132
--void          hb_set_chapter_name( hb_handle_t *, int, int, const char * );
1133
--void          hb_set_job( hb_handle_t *, int, hb_job_t * );
1134
--void          hb_add( hb_handle_t *, hb_job_t * );
1135
--void          hb_rem( hb_handle_t *, hb_job_t * );
1136
--
1137
--void          hb_start( hb_handle_t * );
1138
--void          hb_pause( hb_handle_t * );
1139
--void          hb_resume( hb_handle_t * );
1140
--void          hb_stop( hb_handle_t * );
1141
--
1142
--/* Persistent data between jobs. */
1143
--typedef struct hb_interjob_s
1144
--{
1145
--    int last_job;          /* job->sequence_id & 0xFFFFFF */
1146
--    int frame_count;       /* number of frames counted by sync */
1147
--    int out_frame_count;   /* number of frames counted by render */
1148
--    uint64_t total_time;   /* real length in 90kHz ticks (i.e. seconds / 90000) */
1149
--    int vrate;             /* actual measured output vrate from 1st pass */
1150
--    int vrate_base;        /* actual measured output vrate_base from 1st pass */
1151
--
1152
--    hb_subtitle_t *select_subtitle; /* foreign language scan subtitle */
1153
--} hb_interjob_t;
1154
--
1155
--hb_interjob_t * hb_interjob_get( hb_handle_t * ); 
1156
--
1157
--/* hb_get_state()
1158
--   Should be regularly called by the UI (like 5 or 10 times a second).
1159
--   Look at test/test.c to see how to use it. */
1160
--void hb_get_state( hb_handle_t *, hb_state_t * );
1161
--void hb_get_state2( hb_handle_t *, hb_state_t * );
1162
--/* hb_get_scancount() is called by the MacGui in UpdateUI to
1163
--   check for a new scan during HB_STATE_WORKING phase  */
1164
--int hb_get_scancount( hb_handle_t * );
1165
--
1166
--/* hb_close()
1167
--   Aborts all current jobs if any, frees memory. */
1168
--void          hb_close( hb_handle_t ** );
1169
--
1170
--/* hb_global_close()
1171
--   Performs final cleanup for the process. */
1172
--void          hb_global_close();
1173
--
1174
--/* hb_get_instance_id()
1175
--   Return the unique instance id of an libhb instance created by hb_init. */
1176
--int hb_get_instance_id( hb_handle_t * h );
1177
--
1178
--#ifdef __cplusplus
1179
--}
1180
--#endif
1181
--
1182
--#endif
1183
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/mcdeint.c HandBrake-0.9.8/libhb/mcdeint.c
1184
---- HandBrake-0.9.8.orig/libhb/mcdeint.c   2011-10-15 23:32:20.000000000 +0200
1185
-+++ HandBrake-0.9.8/libhb/mcdeint.c    2013-04-05 20:10:38.000000000 +0200
1186
-@@ -16,7 +16,7 @@
1187
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1188
- */
1189
- 
1190
--#include "hb.h"
1191
-+#include "handbrake.h"
1192
- #include "hbffmpeg.h"
1193
- #include "mpeg2dec/mpeg2.h"
1194
- #include "mcdeint.h"
1195
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/muxcommon.c HandBrake-0.9.8/libhb/muxcommon.c
1196
---- HandBrake-0.9.8.orig/libhb/muxcommon.c 2011-11-15 00:50:18.000000000 +0100
1197
-+++ HandBrake-0.9.8/libhb/muxcommon.c  2013-04-05 20:10:38.000000000 +0200
1198
-@@ -4,7 +4,7 @@
1199
-    Homepage: <http://handbrake.fr/>.
1200
-    It may be used under the terms of the GNU General Public License. */
1201
- 
1202
--#include "hb.h"
1203
-+#include "handbrake.h"
1204
- 
1205
- #define MIN_BUFFERING (1024*1024*10)
1206
- #define MAX_BUFFERING (1024*1024*50)
1207
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/muxmkv.c HandBrake-0.9.8/libhb/muxmkv.c
1208
---- HandBrake-0.9.8.orig/libhb/muxmkv.c    2012-06-29 14:24:41.000000000 +0200
1209
-+++ HandBrake-0.9.8/libhb/muxmkv.c 2013-04-05 20:10:38.000000000 +0200
1210
-@@ -9,7 +9,7 @@
1211
- 
1212
- #include <ogg/ogg.h>
1213
- 
1214
--#include "hb.h"
1215
-+#include "handbrake.h"
1216
- #include "lang.h"
1217
- 
1218
- /* Scale factor to apply to timecodes to convert from HandBrake's
1219
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/muxmp4.c HandBrake-0.9.8/libhb/muxmp4.c
1220
---- HandBrake-0.9.8.orig/libhb/muxmp4.c    2011-11-15 22:36:45.000000000 +0100
1221
-+++ HandBrake-0.9.8/libhb/muxmp4.c 2013-04-05 20:10:38.000000000 +0200
1222
-@@ -7,7 +7,7 @@
1223
- #include "mp4v2/mp4v2.h"
1224
- #include "a52dec/a52.h"
1225
- 
1226
--#include "hb.h"
1227
-+#include "handbrake.h"
1228
- 
1229
- struct hb_mux_object_s
1230
- {
1231
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/platform/macosx/encca_aac.c HandBrake-0.9.8/libhb/platform/macosx/encca_aac.c
1232
---- HandBrake-0.9.8.orig/libhb/platform/macosx/encca_aac.c 2012-06-29 14:33:47.000000000 +0200
1233
-+++ HandBrake-0.9.8/libhb/platform/macosx/encca_aac.c  2013-04-05 20:10:38.000000000 +0200
1234
-@@ -2,7 +2,7 @@
1235
-  Homepage: <http://handbrake.fr/>.
1236
-  It may be used under the terms of the GNU General Public License. */
1237
- 
1238
--#include "hb.h"
1239
-+#include "handbrake.h"
1240
- #include "downmix.h"
1241
- #include <AudioToolbox/AudioToolbox.h>
1242
- #include <CoreAudio/CoreAudio.h>
1243
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/ports.c HandBrake-0.9.8/libhb/ports.c
1244
---- HandBrake-0.9.8.orig/libhb/ports.c 2012-05-01 13:24:28.000000000 +0200
1245
-+++ HandBrake-0.9.8/libhb/ports.c  2013-04-05 20:10:38.000000000 +0200
1246
-@@ -66,7 +66,7 @@
1247
- #include <stddef.h>
1248
- #include <unistd.h>
1249
- 
1250
--#include "hb.h"
1251
-+#include "handbrake.h"
1252
- 
1253
- /************************************************************************
1254
-  * hb_get_date()
1255
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/reader.c HandBrake-0.9.8/libhb/reader.c
1256
---- HandBrake-0.9.8.orig/libhb/reader.c    2012-07-03 20:53:04.000000000 +0200
1257
-+++ HandBrake-0.9.8/libhb/reader.c 2013-04-05 20:10:38.000000000 +0200
1258
-@@ -4,7 +4,7 @@
1259
-    Homepage: <http://handbrake.fr/>.
1260
-    It may be used under the terms of the GNU General Public License. */
1261
- 
1262
--#include "hb.h"
1263
-+#include "handbrake.h"
1264
- 
1265
- static int  hb_reader_init( hb_work_object_t * w, hb_job_t * job );
1266
- static void hb_reader_close( hb_work_object_t * w );
1267
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/render.c HandBrake-0.9.8/libhb/render.c
1268
---- HandBrake-0.9.8.orig/libhb/render.c    2012-07-17 16:34:34.000000000 +0200
1269
-+++ HandBrake-0.9.8/libhb/render.c 2013-04-05 20:10:38.000000000 +0200
1270
-@@ -4,7 +4,7 @@
1271
-    Homepage: <http://handbrake.fr/>.
1272
-    It may be used under the terms of the GNU General Public License. */
1273
- 
1274
--#include "hb.h"
1275
-+#include "handbrake.h"
1276
- #include "hbffmpeg.h"
1277
- 
1278
- struct hb_work_private_s
1279
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/rotate.c HandBrake-0.9.8/libhb/rotate.c
1280
---- HandBrake-0.9.8.orig/libhb/rotate.c    2009-12-19 16:19:12.000000000 +0100
1281
-+++ HandBrake-0.9.8/libhb/rotate.c 2013-04-05 20:10:38.000000000 +0200
1282
-@@ -1,5 +1,5 @@
1283
- 
1284
--#include "hb.h"
1285
-+#include "handbrake.h"
1286
- #include "hbffmpeg.h"
1287
- //#include "mpeg2dec/mpeg2.h"
1288
- 
1289
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/scan.c HandBrake-0.9.8/libhb/scan.c
1290
---- HandBrake-0.9.8.orig/libhb/scan.c  2012-07-07 01:29:10.000000000 +0200
1291
-+++ HandBrake-0.9.8/libhb/scan.c   2013-04-05 20:10:38.000000000 +0200
1292
-@@ -4,7 +4,7 @@
1293
-    Homepage: <http://handbrake.fr/>.
1294
-    It may be used under the terms of the GNU General Public License. */
1295
- 
1296
--#include "hb.h"
1297
-+#include "handbrake.h"
1298
- #include "hbffmpeg.h"
1299
- #include "a52dec/a52.h"
1300
- #include "dca.h"
1301
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/stream.c HandBrake-0.9.8/libhb/stream.c
1302
---- HandBrake-0.9.8.orig/libhb/stream.c    2012-06-17 16:12:10.000000000 +0200
1303
-+++ HandBrake-0.9.8/libhb/stream.c 2013-04-05 20:10:38.000000000 +0200
1304
-@@ -8,7 +8,7 @@
1305
- #include <ctype.h>
1306
- #include <errno.h>
1307
- 
1308
--#include "hb.h"
1309
-+#include "handbrake.h"
1310
- #include "hbffmpeg.h"
1311
- #include "lang.h"
1312
- #include "a52dec/a52.h"
1313
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/sync.c HandBrake-0.9.8/libhb/sync.c
1314
---- HandBrake-0.9.8.orig/libhb/sync.c  2012-05-01 12:08:03.000000000 +0200
1315
-+++ HandBrake-0.9.8/libhb/sync.c   2013-04-05 20:10:38.000000000 +0200
1316
-@@ -4,7 +4,7 @@
1317
-    Homepage: <http://handbrake.fr/>.
1318
-    It may be used under the terms of the GNU General Public License. */
1319
- 
1320
--#include "hb.h"
1321
-+#include "handbrake.h"
1322
- #include "hbffmpeg.h"
1323
- #include <stdio.h>
1324
- #include "samplerate.h"
1325
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/update.c HandBrake-0.9.8/libhb/update.c
1326
---- HandBrake-0.9.8.orig/libhb/update.c    2009-06-24 05:18:52.000000000 +0200
1327
-+++ HandBrake-0.9.8/libhb/update.c 2013-04-05 20:10:38.000000000 +0200
1328
-@@ -4,7 +4,7 @@
1329
-    Homepage: <http://handbrake.fr/>.
1330
-    It may be used under the terms of the GNU General Public License. */
1331
- 
1332
--#include "hb.h"
1333
-+#include "handbrake.h"
1334
- 
1335
- static void UpdateFunc( void * );
1336
- 
1337
-diff -x '*~' -urN HandBrake-0.9.8.orig/libhb/work.c HandBrake-0.9.8/libhb/work.c
1338
---- HandBrake-0.9.8.orig/libhb/work.c  2012-02-22 00:56:12.000000000 +0100
1339
-+++ HandBrake-0.9.8/libhb/work.c   2013-04-05 20:10:38.000000000 +0200
1340
-@@ -4,7 +4,7 @@
1341
-    Homepage: <http://handbrake.fr/>.
1342
-    It may be used under the terms of the GNU General Public License. */
1343
- 
1344
--#include "hb.h"
1345
-+#include "handbrake.h"
1346
- #include "a52dec/a52.h"
1347
- #include "dca.h"
1348
- #include "libavformat/avformat.h"
1349
-diff -x '*~' -urN HandBrake-0.9.8.orig/macosx/ChapterTitles.h HandBrake-0.9.8/macosx/ChapterTitles.h
1350
---- HandBrake-0.9.8.orig/macosx/ChapterTitles.h    2009-03-01 19:00:26.000000000 +0100
1351
-+++ HandBrake-0.9.8/macosx/ChapterTitles.h 2013-04-05 20:56:10.000000000 +0200
1352
-@@ -5,7 +5,7 @@
1353
-    It may be used under the terms of the GNU General Public License. */
1354
- 
1355
- #include <Cocoa/Cocoa.h>
1356
--#include "hb.h"
1357
-+#include "handbrake.h"
1358
- 
1359
- @interface ChapterTitles : NSObject {
1360
-     hb_title_t *fTitle;
1361
-diff -x '*~' -urN HandBrake-0.9.8.orig/macosx/Controller.h HandBrake-0.9.8/macosx/Controller.h
1362
---- HandBrake-0.9.8.orig/macosx/Controller.h   2012-01-24 18:13:26.000000000 +0100
1363
-+++ HandBrake-0.9.8/macosx/Controller.h    2013-04-05 20:56:10.000000000 +0200
1364
-@@ -7,7 +7,7 @@
1365
- #import <Cocoa/Cocoa.h>
1366
- #import <Growl/Growl.h>
1367
- 
1368
--#include "hb.h"
1369
-+#include "handbrake.h"
1370
- 
1371
- #import "ChapterTitles.h"
1372
- #import "HBSubtitles.h"
1373
-diff -x '*~' -urN HandBrake-0.9.8.orig/macosx/HBPreviewController.h HandBrake-0.9.8/macosx/HBPreviewController.h
1374
---- HandBrake-0.9.8.orig/macosx/HBPreviewController.h  2010-08-05 18:45:00.000000000 +0200
1375
-+++ HandBrake-0.9.8/macosx/HBPreviewController.h   2013-04-05 20:56:10.000000000 +0200
1376
-@@ -6,7 +6,7 @@
1377
- 
1378
- #import <Cocoa/Cocoa.h>
1379
- 
1380
--#include "hb.h"
1381
-+#include "handbrake.h"
1382
- /* Needed for Quicktime movie previews */
1383
- #import <QTKit/QTKit.h> 
1384
- 
1385
-diff -x '*~' -urN HandBrake-0.9.8.orig/macosx/HBQueueController.h HandBrake-0.9.8/macosx/HBQueueController.h
1386
---- HandBrake-0.9.8.orig/macosx/HBQueueController.h    2010-07-19 19:02:43.000000000 +0200
1387
-+++ HandBrake-0.9.8/macosx/HBQueueController.h 2013-04-05 20:56:10.000000000 +0200
1388
-@@ -6,7 +6,7 @@
1389
- 
1390
- 
1391
- #import <Cocoa/Cocoa.h>
1392
--#include "hb.h"
1393
-+#include "handbrake.h"
1394
- 
1395
- @class HBController;
1396
- 
1397
-diff -x '*~' -urN HandBrake-0.9.8.orig/macosx/HBSubtitles.h HandBrake-0.9.8/macosx/HBSubtitles.h
1398
---- HandBrake-0.9.8.orig/macosx/HBSubtitles.h  2010-01-21 19:58:17.000000000 +0100
1399
-+++ HandBrake-0.9.8/macosx/HBSubtitles.h   2013-04-05 20:56:10.000000000 +0200
1400
-@@ -5,7 +5,7 @@
1401
-    It may be used under the terms of the GNU General Public License. */
1402
- 
1403
- #import <Cocoa/Cocoa.h>
1404
--#include "hb.h"
1405
-+#include "handbrake.h"
1406
- 
1407
- 
1408
- 
1409
-diff -x '*~' -urN HandBrake-0.9.8.orig/macosx/PictureController.h HandBrake-0.9.8/macosx/PictureController.h
1410
---- HandBrake-0.9.8.orig/macosx/PictureController.h    2010-08-05 18:45:00.000000000 +0200
1411
-+++ HandBrake-0.9.8/macosx/PictureController.h 2013-04-05 20:56:10.000000000 +0200
1412
-@@ -6,7 +6,7 @@
1413
- 
1414
- #import <Cocoa/Cocoa.h>
1415
- 
1416
--#include "hb.h" 
1417
-+#include "handbrake.h" 
1418
- 
1419
- @class HBController;
1420
- @class PreviewController;
1421
-diff -x '*~' -urN HandBrake-0.9.8.orig/test/parsecsv.c HandBrake-0.9.8/test/parsecsv.c
1422
---- HandBrake-0.9.8.orig/test/parsecsv.c   2009-06-24 05:18:52.000000000 +0200
1423
-+++ HandBrake-0.9.8/test/parsecsv.c    2013-04-05 20:10:38.000000000 +0200
1424
-@@ -5,7 +5,7 @@
1425
-    It may be used under the terms of the GNU General Public License. */
1426
- 
1427
- #include <fcntl.h>
1428
--#include "hb.h"
1429
-+#include "handbrake.h"
1430
- #include "parsecsv.h"
1431
- 
1432
- /* Internal declarations */
1433
-diff -x '*~' -urN HandBrake-0.9.8.orig/test/test.c HandBrake-0.9.8/test/test.c
1434
---- HandBrake-0.9.8.orig/test/test.c   2012-07-17 18:39:18.000000000 +0200
1435
-+++ HandBrake-0.9.8/test/test.c    2013-04-05 20:10:38.000000000 +0200
1436
-@@ -19,7 +19,7 @@
1437
- #include <pthread.h>
1438
- #endif
1439
- 
1440
--#include "hb.h"
1441
-+#include "handbrake.h"
1442
- #include "lang.h"
1443
- #include "parsecsv.h"
1444
- 
1445
HandBrake-0.9.8.tar.bz2 -> HandBrake-0.9.9.tar.bz2 Changed
fontconfig-2.8.0.tar.gz Deleted
freetype-2.4.7.tar.bz2 Deleted
handbrake.ebuild Added
56
 
1
@@ -0,0 +1,54 @@
2
+# $Id: PKGBUILD 74053 2012-07-18 17:33:26Z foutrelis $
3
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
4
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
5
+# Contributor: Sebastien Piccand <sebcactus gmail com>
6
+
7
+pkgname=('handbrake' 'handbrake-cli')
8
+pkgver=0.9.8
9
+pkgrel=28
10
+arch=('i686' 'x86_64')
11
+url="http://handbrake.fr/"
12
+license=('GPL')
13
+makedepends=('intltool' 'python2' 'yasm' 'wget' 'bzip2' 'gcc-libs' 'libnotify'
14
+             'gstreamer0.10-base' 'gtk2' 'dbus-glib' 'fribidi')
15
+source=(http://downloads.sourceforge.net/project/handbrake/$pkgver/HandBrake-$pkgver.tar.bz2)
16
+
17
+build() {
18
+  cd "$srcdir/HandBrake-$pkgver"
19
+  mv "libhb/hb.h" "libhb/hb2.h"
20
+  
21
+  # Fix #include libhb
22
+  for file in $(grep -R '#include "hb.h"' * 2>/dev/null | awk -F':' '{print $1}'); do sed -i 's/#include\ \"hb\.h\"/#include\ \"hb2\.h\"/g' ${file}; done
23
+  # Use Python 2
24
+  sed -i 's/python /python2 /' gtk/src/Makefile.am
25
+
26
+  #disable harfbuzz
27
+  sed -i 's/--disable-png\ --disable-enca\ \\/--disable-png\ --disable-enca\ --disable-harfbuzz\ \\/g' "$srcdir/HandBrake-$pkgver/contrib/libass/module.defs"
28
+
29
+  ./configure --prefix=/usr --force --disable-gtk-update-checks
30
+  cd build
31
+  make
32
+}
33
+
34
+package_handbrake() {
35
+  pkgdesc="Multithreaded video transcoder"
36
+  depends=('bzip2' 'gcc-libs' 'gstreamer0.10-base' 'libnotify' 'dbus-glib'
37
+           'fribidi' 'gtk2' 'desktop-file-utils' 'hicolor-icon-theme')
38
+  install=$pkgname.install
39
+
40
+  cd "$srcdir/HandBrake-$pkgver/build"
41
+
42
+  make DESTDIR="$pkgdir" install
43
+  rm "$pkgdir/usr/bin/HandBrakeCLI"
44
+}
45
+
46
+package_handbrake-cli() {
47
+  pkgdesc="Multithreaded video transcoder (CLI)"
48
+  depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi')
49
+
50
+  cd "$srcdir/HandBrake-$pkgver/build"
51
+  install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI"
52
+}
53
+
54
+# vim:set ts=2 sw=2 et:
55
+sha256sums=('dba75a9ff772e419c01d75532c1bf0d7253e73d7ead184eee755cd4c133dc798')
56
libass-0.10.0-1.tar.gz Deleted
libav-v9.6.tar.bz2 Added
libbluray-0.0.1-pre-213-ga869da8.tar.gz -> libbluray-0.2.3.tar.bz2 Changed
libogg-1.3.0.tar.gz Deleted
libsamplerate-0.1.4.tar.gz Deleted
libtheora-1.1.0.tar.bz2 Deleted
libvorbis-aotuv_b6.03.tar.bz2 Deleted
libxml2-2.7.7.tar.gz Deleted
x264-r2146-bcd41db.tar.gz Deleted
x264-r2273-b3065e6.tar.gz Added
yasm-1.1.0.tar.gz -> yasm-1.2.0.tar.gz Changed
Refresh

No build results available

Refresh

No rpmlint results available

Request History
David Haller's avatar

dnh created request over 11 years ago

Update to 0.9.9, no idea where I got the .ebuild from ...


Peter Linnell's avatar

mrdocs accepted request over 11 years ago

Thanks for the update. Keep them coming.