Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Debian build fixes #4358

Closed
wants to merge 4 commits into from
Closed

Debian build fixes #4358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da28b2b
Don't enter ffmpeg dir when using external ffmpeg/libav
rbalint Mar 6, 2014
f8b20ac
Fix compilation with libav 10 beta1
rbalint Mar 6, 2014
f2c56e5
Use NULL from cstddef
rbalint Mar 6, 2014
f070f26
Disable static ffmpeg when using external ffmpeg/libav
rbalint Mar 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions configure.in
View file
Open in desktop
Expand Up @@ -874,6 +874,9 @@ elif test "$use_arch" = "arm"; then
fi fi
fi fi
fi fi
if test "$use_static_ffmpeg" = "yes" -a "$use_external_ffmpeg" = "yes"; then
use_static_ffmpeg=no
fi
if test "$use_static_ffmpeg" = "yes"; then if test "$use_static_ffmpeg" = "yes"; then
USE_STATIC_FFMPEG=1 USE_STATIC_FFMPEG=1
AC_DEFINE([USE_STATIC_FFMPEG], [1], [link ffmpeg statically]) AC_DEFINE([USE_STATIC_FFMPEG], [1], [link ffmpeg statically])
Expand Down
2 changes: 2 additions & 0 deletions lib/Makefile.in
View file
Open in desktop
Expand Up @@ -87,12 +87,14 @@ ffmpeg/libswresample/libswresample.a : ffmpeg;
endif endif


ffmpeg: ffmpeg:
ifneq (@USE_EXTERNAL_FFMPEG@,1)
$(MAKE) -C $@ $(MAKE) -C $@
ifeq ($(findstring osx,$(ARCH)), osx) ifeq ($(findstring osx,$(ARCH)), osx)
-$(AR) d ffmpeg/libavcodec/libavcodec.a log2_tab.o -$(AR) d ffmpeg/libavcodec/libavcodec.a log2_tab.o
-$(AR) d ffmpeg/libavformat/libavformat.a log2_tab.o -$(AR) d ffmpeg/libavformat/libavformat.a log2_tab.o
-$(AR) d ffmpeg/libswresample/libswresample.a log2_tab.o -$(AR) d ffmpeg/libswresample/libswresample.a log2_tab.o
endif endif
endif


clean: clean:
rm -f $(addprefix $(SYSDIR)/, $(LIBS)) rm -f $(addprefix $(SYSDIR)/, $(LIBS))
Expand Down
5 changes: 5 additions & 0 deletions lib/xbmc-libav-hacks/libav_hacks.h
View file
Open in desktop
Expand Up @@ -35,6 +35,11 @@
#error "Your libav version is too old. Please update to libav-10 or git master." #error "Your libav version is too old. Please update to libav-10 or git master."
#endif #endif


// libavcodec

// AVCodecContext does not have pkt_timebase member
#define pkt_timebase time_base

// libavutil // libavutil


#define AVFRAME_IN_LAVU #define AVFRAME_IN_LAVU
Expand Down
2 changes: 2 additions & 0 deletions xbmc/GitRevision.cpp
View file
Open in desktop
Expand Up @@ -20,6 +20,8 @@


#include "GitRevision.h" #include "GitRevision.h"


#include <cstddef>

#if defined(TARGET_DARWIN) || (defined(TARGET_WINDOWS) && !defined(_DEBUG)) #if defined(TARGET_DARWIN) || (defined(TARGET_WINDOWS) && !defined(_DEBUG))
#include "../git_revision.h" // generated file #include "../git_revision.h" // generated file
#endif #endif
Expand Down