Djam/vlc-2.0.7
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/vlc-2.0.7.git synced 2025-02-23 09:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic import for version 2.0.7-69mib2009.1

Browse source
This commit is contained in:
Rosa 2013-05-27 12:48:07 +04:00
commit 912542cecf
13 changed files with 2366 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml Normal file
View file

@ -0,0 +1,2 @@
sources:
"vlc-2.0.7.tar.xz": d3dc6605cc296806ada16b5f9b819705c9cc1319

14
dmo-birgb.patch Normal file
View file

@ -0,0 +1,14 @@
diff -rupN vlc-2.0.4.orig/modules/codec/dmo/dmo.c vlc-2.0.4/modules/codec/dmo/dmo.c
--- vlc-2.0.4.orig/modules/codec/dmo/dmo.c 2012-10-19 20:37:06.861228870 -0400
+++ vlc-2.0.4/modules/codec/dmo/dmo.c 2012-10-19 20:51:06.533228863 -0400
@@ -179,6 +179,10 @@ static const GUID guid_wma_enc = { 0x70f
#define VLC_CODEC_MSS1 VLC_FOURCC('M','S','S','1')
#define VLC_CODEC_MSS2 VLC_FOURCC('M','S','S','2')
+#ifndef BI_RGB
+# define BI_RGB 0x0
+#endif
+
typedef struct
{
vlc_fourcc_t i_fourcc;

20
moc-libresid-builder.so_not_la.patch Normal file
View file

@ -0,0 +1,20 @@
There is absolutely no point in using libtool files of libresid-builder, or even expect them to be present.
http://bugs.gentoo.org/416619
--- decoder_plugins/sidplay2/sidplay2.m4
+++ decoder_plugins/sidplay2/sidplay2.m4
@@ -19,10 +19,10 @@
if test "x$sidutils_OK" = "xyes"; then
s2lib=`$PKG_CONFIG --variable=libdir libsidplay2 2>/dev/null`
resid_OK="no"
- AC_CHECK_FILE([$s2lib/libresid-builder.la],
- [resid_lib="$s2lib/libresid-builder.la"
+ AC_CHECK_FILE([$s2lib/libresid-builder.so],
+ [resid_lib="$s2lib/libresid-builder.so"
resid_OK="yes"],
- [resid_lib="$s2lib/sidplay/builders/libresid-builder.la"
+ [resid_lib="$s2lib/sidplay/builders/libresid-builder.so"
AC_CHECK_FILE($resid_lib, [resid_OK="yes"],)])
if test "x$resid_OK" = "xyes"; then
sidplay2_LDFLAGS="$resid_lib"

24
noerrorimplicit.patch Normal file
View file

@ -0,0 +1,24 @@
diff -rupN vlc-2.0.4.orig/configure vlc-2.0.4/configure
--- vlc-2.0.4.orig/configure 2012-10-19 20:37:03.244228373 -0400
+++ vlc-2.0.4/configure 2012-10-19 20:39:03.086229156 -0400
@@ -24763,7 +24763,7 @@ fi
LIBS="${LIBS_save}"
- for a in all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration; do
+ for a in all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var; do
CFLAGS_save="${CFLAGS}"
diff -rupN vlc-2.0.4.orig/configure.ac vlc-2.0.4/configure.ac
--- vlc-2.0.4.orig/configure.ac 2012-10-19 20:37:03.467228869 -0400
+++ vlc-2.0.4/configure.ac 2012-10-19 20:39:14.668226947 -0400
@@ -873,7 +873,7 @@ dnl
dnl Compiler warnings
dnl
-RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration])
+RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var])
RDC_PROG_CC_FLAGS([-pipe])
AC_LANG_PUSH([C++])
RDC_PROG_CXX_WFLAGS([all extra sign-compare undef pointer-arith volatile-register-var])

10
vlc-1.1.6-lirc-fix-includes.patch Normal file
View file

@ -0,0 +1,10 @@
--- vlc-1.1.6/modules/control/lirc.c.orig 2011-01-26 19:28:23.114204089 +0200
+++ vlc-1.1.6/modules/control/lirc.c 2011-01-26 19:28:30.378912391 +0200
@@ -42,6 +42,7 @@
#endif
#include <lirc/lirc_client.h>
+#include <errno.h>
#define LIRC_TEXT N_("Change the lirc configuration file")
#define LIRC_LONGTEXT N_( \

12
vlc-1.1.8-bugfix.opencv22.patch Normal file
View file

@ -0,0 +1,12 @@
diff -up vlc-1.1.8/modules/video_filter/opencv_example.c.opencv22 vlc-1.1.8/modules/video_filter/opencv_example.c
--- vlc-1.1.8/modules/video_filter/opencv_example.c.opencv22 2010-04-13 02:22:27.000000000 +0200
+++ vlc-1.1.8/modules/video_filter/opencv_example.c 2011-03-23 10:47:05.053097995 +0100
@@ -191,7 +191,7 @@ static picture_t *Filter( filter_t *p_fi
CvSeq *faces = cvHaarDetectObjects( p_img[0], p_sys->p_cascade,
p_sys->p_storage, 1.15, 5,
CV_HAAR_DO_CANNY_PRUNING,
- cvSize(20, 20) );
+ cvSize(0, 0), cvSize(0, 0) );
//create the video_filter_region_info_t struct
if (faces && (faces->total > 0))
{

11
vlc-2.0.0-fix-default-font.patch Normal file
View file

@ -0,0 +1,11 @@
--- vlc-2.0.0/modules/text_renderer/freetype.c.fontpath 2012-02-20 11:18:04.131225762 +0100
+++ vlc-2.0.0/modules/text_renderer/freetype.c 2012-02-20 11:19:11.917241901 +0100
@@ -58,7 +58,7 @@
# define DEFAULT_FONT_FILE "/usr/share/fonts/nokia/nosnb.ttf"
# define DEFAULT_FAMILY "Nokia Sans Bold"
#else
-# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
+# define DEFAULT_FONT_FILE "/usr/share/fonts/TTF/VeraBd.ttf"
# define DEFAULT_FAMILY "Serif Bold"
#endif

31
vlc-2.0.0-live555-path.patch Normal file
View file

@ -0,0 +1,31 @@
--- vlc-2.0.0/configure.ac.live555 2012-02-20 15:21:16.697763573 +0100
+++ vlc-2.0.0/configure.ac 2012-02-20 15:39:44.717763569 +0100
@@ -1720,7 +1720,7 @@ AS_IF([test "${enable_live555}" != "no"
AC_LANG_PUSH(C++)
CPPFLAGS_save="${CPPFLAGS}"
AS_IF([test -z "${CONTRIB_DIR}"], [
- CPPFLAGS_live555="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment"
+ CPPFLAGS_live555="-I${libdir}/live/liveMedia/include -I${libdir}/live/groupsock/include -I${libdir}/live/BasicUsageEnvironment/include -I${libdir}/live/UsageEnvironment/include"
], [
CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment"
])
@@ -1749,7 +1749,7 @@ You can get an updated one from http://w
AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.])
])
], [
- other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"
+ other_libs="-L${libdir}/live/groupsock -lgroupsock -L${libdir}/live/BasicUsageEnvironment -lBasicUsageEnvironment -L${libdir}/live/UsageEnvironment -lUsageEnvironment"
other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic"
AS_IF([test "${SYS}" = "mingw32"], [
# add ws2_32 for closesocket, select, recv
@@ -1768,8 +1768,8 @@ You can get an updated one from http://w
],[
AC_CHECK_LIB(liveMedia, main, [
VLC_ADD_PLUGIN([live555])
- VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}])
- ],[],[${other_libs}])],[${other_libs_pic}])
+ VLC_ADD_LIBS([live555], [-L${libdir}/live/liveMedia -lliveMedia ${other_libs}])
+ ],[],[-L${libdir}/live/liveMedia ${other_libs}])],[${other_libs_pic}])
])
CPPFLAGS="${CPPFLAGS_save}"
AC_LANG_POP(C++)

23
vlc-2.0.0-mdv2010.1-updated-pulse-version-is-ok.patch Normal file
View file

@ -0,0 +1,23 @@
--- vlc-2.0.0/configure.ac.pulse-version 2012-02-17 15:38:25.000000000 +0100
+++ vlc-2.0.0/configure.ac 2012-02-20 11:25:27.624307853 +0100
@@ -3428,7 +3428,7 @@ AC_ARG_ENABLE(pulse,
[use the PulseAudio client library (default auto)])])
have_pulse="no"
AS_IF([test "${enable_pulse}" != "no"], [
- PKG_CHECK_MODULES([PULSE], [libpulse >= 0.9.22], [
+ PKG_CHECK_MODULES([PULSE], [libpulse >= 0.9.21], [
have_pulse="yes"
], [
PKG_CHECK_MODULES([PULSE], [libpulse >= 0.9.16], [
--- vlc-2.0.0/modules/audio_output/pulse.c.pulse-version 2011-12-08 19:00:26.000000000 +0100
+++ vlc-2.0.0/modules/audio_output/pulse.c 2012-02-20 11:26:02.990321695 +0100
@@ -33,7 +33,7 @@
#include <pulse/pulseaudio.h>
#include "vlcpulse.h"
-#if !PA_CHECK_VERSION(0,9,22)
+#if !PA_CHECK_VERSION(0,9,21)
# include <vlc_xlib.h>
#endif
#if !PA_CHECK_VERSION(3,0,0)
#endif

10
vlc-2.0.1-automake-1.12.patch Normal file
View file

@ -0,0 +1,10 @@
--- vlc-2.0.1/configure.ac.bero 2012-07-11 21:29:00.041148442 +0200
+++ vlc-2.0.1/configure.ac 2012-07-11 21:29:16.717124926 +0200
@@ -64,6 +64,7 @@ AM_PROG_CC_C_O
AC_PROG_CXX
AC_PROG_CPP
AC_PROG_OBJC
+AC_PROG_OBJCXX
_AM_DEPENDENCIES([OBJC])
AC_PROG_EGREP
AC_PROG_MAKE_SET

11
vlc-2.0.4-fix-definition.patch Normal file
View file

@ -0,0 +1,11 @@
--- modules/codec/dmo/dmo.c~ 2012-09-14 00:02:04.000000000 +0800
+++ modules/codec/dmo/dmo.c 2012-10-16 07:10:41.145463290 +0800
@@ -546,7 +546,7 @@
}
p_bih = &p_vih->bmiHeader;
- p_bih->biCompression = i_chroma == VLC_CODEC_RGB24 ? BI_RGB : i_chroma;
+ p_bih->biCompression = i_chroma == VLC_CODEC_RGB24 ? 0L : i_chroma;
p_bih->biHeight *= -1;
p_bih->biBitCount = p_dec->fmt_out.video.i_bits_per_pixel;
p_bih->biSizeImage = p_dec->fmt_in.video.i_width *

2185
vlc-2.0.7-69mib.spec Normal file
View file

File diff suppressed because it is too large Load diff

13
vlc-MIB-aboutmessage.patch Normal file
View file

@ -0,0 +1,13 @@
diff -Nur vlc-1.1.5-orig/modules/gui/qt4/dialogs/help.cpp vlc-1.1.5/modules/gui/qt4/dialogs/help.cpp
--- vlc-1.1.5-orig/modules/gui/qt4/dialogs/help.cpp 2011-01-14 12:46:06.485861797 +0100
+++ vlc-1.1.5/modules/gui/qt4/dialogs/help.cpp 2011-01-14 12:49:00.302611676 +0100
@@ -117,8 +117,7 @@
"VLC uses its internal codecs and works on essentially every "
"popular platform.\n\n" )
+ qtr( "This version of VLC was compiled by:\n " )
- + qfu( VLC_CompileBy() )+ " on " + qfu( VLC_CompileHost() ) +
- + " ("__DATE__" "__TIME__").\n"
+ + "MIB by grissino ("__DATE__" "__TIME__").\n"
+ qtr( "Compiler: " ) + qfu( VLC_Compiler() ) + ".\n"
+ qtr( "You are using the Qt4 Interface.\n\n" )
+ qtr( "Copyright (C) " ) + COPYRIGHT_YEARS