diff options
author | Eric Hameleers <alien@slackware.com> | 2009-03-30 10:23:14 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2009-03-30 10:23:14 +0000 |
commit | db51a0decb3226f4588c77130f21ca64750c9030 (patch) | |
tree | 94823dee642a6ca45136c9f28aefc366552ad5ef /vlc/build | |
parent | 88103bb30ebb6a59a830e2e437de3cd3c5f1e13c (diff) | |
download | asb-db51a0decb3226f4588c77130f21ca64750c9030.tar.gz asb-db51a0decb3226f4588c77130f21ca64750c9030.tar.xz |
Initial revision
Diffstat (limited to 'vlc/build')
-rw-r--r-- | vlc/build/vlc-0.9.9_x264_obsolete_pre_scenecut.diff | 28 | ||||
-rw-r--r-- | vlc/build/vlc-0.9.9_x264_remove_pre_scenecut.diff | 47 | ||||
-rw-r--r-- | vlc/build/vlc_x264_static.diff | 47 |
3 files changed, 122 insertions, 0 deletions
diff --git a/vlc/build/vlc-0.9.9_x264_obsolete_pre_scenecut.diff b/vlc/build/vlc-0.9.9_x264_obsolete_pre_scenecut.diff new file mode 100644 index 00000000..4906cb0b --- /dev/null +++ b/vlc/build/vlc-0.9.9_x264_obsolete_pre_scenecut.diff @@ -0,0 +1,28 @@ +From: Jean-Baptiste Kempf <jb@videolan.org> +Date: Wed, 11 Mar 2009 23:47:13 +0000 (+0100) +Subject: x264: obsolete pre-scenecut option. +X-Git-Tag: 1.0.0-pre1~133 +X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=d46728dff61b74e6cffd11615b7fa3a526075b0f + +x264: obsolete pre-scenecut option. +--- + +diff --git a/modules/codec/x264.c b/modules/codec/x264.c +index 0be0824..cfd7e8c 100644 +--- a/modules/codec/x264.c ++++ b/modules/codec/x264.c +@@ -434,9 +434,13 @@ vlc_module_begin () + SCENE_LONGTEXT, false ) + change_integer_range( -1, 100 ) + +-#if X264_BUILD >= 55 /* r607 */ && X264_BUILD < 67 /* r1117 */ ++#if X264_BUILD >= 55 /* r607 */ ++# if X264_BUILD < 67 /* r1117 */ + add_bool( SOUT_CFG_PREFIX "pre-scenecut", 0, NULL, PRESCENE_TEXT, + PRESCENE_LONGTEXT, false ) ++# else ++ add_obsolete_bool( "pre-scenecut" ) ++# endif + #endif + + add_integer( SOUT_CFG_PREFIX "bframes", 0, NULL, BFRAMES_TEXT, diff --git a/vlc/build/vlc-0.9.9_x264_remove_pre_scenecut.diff b/vlc/build/vlc-0.9.9_x264_remove_pre_scenecut.diff new file mode 100644 index 00000000..5bade397 --- /dev/null +++ b/vlc/build/vlc-0.9.9_x264_remove_pre_scenecut.diff @@ -0,0 +1,47 @@ +From: Sabourin Gilles <gilles.sabourin@free.fr> +Date: Wed, 11 Mar 2009 23:05:53 +0000 (+0100) +Subject: x264 Removed pre-scenecut definitions for build 67 +X-Git-Tag: 1.0.0-pre1~136 +X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=8f601a32ed1086f0b9d0046b62ab7c6ad525e0b3 + +x264 Removed pre-scenecut definitions for build 67 + +Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> +--- + +diff --git a/modules/codec/x264.c b/modules/codec/x264.c +index b2ddf23..0be0824 100644 +--- a/modules/codec/x264.c ++++ b/modules/codec/x264.c +@@ -75,7 +75,7 @@ static void Close( vlc_object_t * ); + "I-frames are inserted only every other keyint frames, which probably " \ + "leads to ugly encoding artifacts. Range 1 to 100." ) + +-#if X264_BUILD >= 55 /* r607 */ ++#if X264_BUILD >= 55 /* r607 */ && X264_BUILD < 67 /* r1117 */ + #define PRESCENE_TEXT N_("Faster, less precise scenecut detection" ) + #define PRESCENE_LONGTEXT N_( "Faster, less precise scenecut detection. " \ + "Required and implied by multi-threading." ) +@@ -434,7 +434,7 @@ vlc_module_begin () + SCENE_LONGTEXT, false ) + change_integer_range( -1, 100 ) + +-#if X264_BUILD >= 55 /* r607 */ ++#if X264_BUILD >= 55 /* r607 */ && X264_BUILD < 67 /* r1117 */ + add_bool( SOUT_CFG_PREFIX "pre-scenecut", 0, NULL, PRESCENE_TEXT, + PRESCENE_LONGTEXT, false ) + #endif +@@ -970,9 +970,12 @@ static int Open ( vlc_object_t *p_this ) + p_sys->param.i_scenecut_threshold = val.i_int; + #endif + +-#if X264_BUILD >= 55 /* r607 */ ++#if X264_BUILD >= 55 /* r607 */ && X264_BUILD < 67 /* r1117 */ + var_Get( p_enc, SOUT_CFG_PREFIX "pre-scenecut", &val ); + p_sys->param.b_pre_scenecut = val.b_bool; ++#endif ++ ++#if X264_BUILD >= 55 /* r607 */ + var_Get( p_enc, SOUT_CFG_PREFIX "non-deterministic", &val ); + p_sys->param.b_deterministic = val.b_bool; + #endif diff --git a/vlc/build/vlc_x264_static.diff b/vlc/build/vlc_x264_static.diff new file mode 100644 index 00000000..960b8d2a --- /dev/null +++ b/vlc/build/vlc_x264_static.diff @@ -0,0 +1,47 @@ +From: Pierre Ynard <linkfanel@yahoo.fr> +Date: Thu, 26 Mar 2009 17:11:17 +0000 (+0100) +Subject: x264: Use -Bsymbolic to fix static link +X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=c20cca8148346e2a3b1a7c0bae69fa74675731ed + +x264: Use -Bsymbolic to fix static link + +On my linux x86_64 system, when trying to statically link the x264 +module against libx264, I get the following error: + +/usr/bin/ld: /usr/local/lib/libx264.a(cabac-a.o): relocation +R_X86_64_PC32 against symbol `x264_cabac_range_lps' can not be used when +making a shared object; recompile with -fPIC +/usr/bin/ld: final link failed: Bad value + +Even though libx264 was compiled as PIC. Dynamically linking against the +shared library, built during the same process, works well. + +The x264 folks said that VLC needed to use the -Bsymbolic flag to allow +conversation of a static PIC library into a shared library, so that's +what I did, and it works for me. + +Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> +--- + +diff --git a/configure.ac b/configure.ac +index 8ae1003..ffc4d36 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3748,7 +3748,7 @@ if test "${enable_x264}" != "no"; then + VLC_ADD_LIBS([x264],[-L${real_x264_tree}]) + PKG_CHECK_MODULES(X264,x264, [ + VLC_ADD_PLUGIN([x264]) +- VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) ++ VLC_ADD_LDFLAGS([x264],[${X264_LIBS} -Wl,-Bsymbolic]) + VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) + if echo ${X264_LIBS} |grep -q 'pthreadGC2'; then + VLC_ADD_CFLAGS([x264], [-DPTW32_STATIC_LIB]) +@@ -3764,7 +3764,7 @@ if test "${enable_x264}" != "no"; then + else + PKG_CHECK_MODULES(X264,x264, [ + VLC_ADD_PLUGIN([x264]) +- VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) ++ VLC_ADD_LDFLAGS([x264],[${X264_LIBS} -Wl,-Bsymbolic]) + VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) + if echo ${X264_LIBS} |grep -q 'pthreadGC2'; then + VLC_ADD_CFLAGS([x264], [-DPTW32_STATIC_LIB]) |