Projects
Games
avifile
avifile-system_wide_ffmpeg.patch
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File avifile-system_wide_ffmpeg.patch of Package avifile
--- Makefile.am | 2 +- configure.in | 19 ------------------- lib/Makefile.am | 4 +--- lib/aviread/Makefile.am | 13 ++----------- plugins/Makefile.am | 2 +- plugins/libffmpeg/Makefile.am | 5 +---- 6 files changed, 6 insertions(+), 39 deletions(-) --- avifile-0.7-0.7.45.orig/Makefile.am +++ avifile-0.7-0.7.45/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . admin m4 ffmpeg drivers lib plugins bin \ +SUBDIRS = . admin m4 drivers lib plugins bin \ doc include debian libavqt player samples EXTRA_DIST = INSTALL autogen.sh avifile.spec.in avifile.pc.in \ --- avifile-0.7-0.7.45.orig/configure.in +++ avifile-0.7-0.7.45/configure.in @@ -798,11 +798,6 @@ if test x$enable_xvid4 = xyes; then fi -dnl ======================= -dnl Configure ffmpeg plugin -dnl ======================= -AM_PATH_FFMPEG - dnl use_nasm= dnl not needed right now dnl AC_CHECK_PROG(use_nasm, nasm, yes, no) @@ -1016,20 +1011,6 @@ dnl libpp/Makefile AC_OUTPUT( Makefile admin/Makefile - ffmpeg/Makefile - ffmpeg/libavformat/Makefile - ffmpeg/libavcodec/Makefile - ffmpeg/libavcodec/alpha/Makefile - ffmpeg/libavcodec/armv4l/Makefile - ffmpeg/libavcodec/i386/Makefile - ffmpeg/libavcodec/liba52/Makefile - ffmpeg/libavcodec/libpostproc/Makefile - ffmpeg/libavcodec/mlib/Makefile - ffmpeg/libavcodec/ppc/Makefile - ffmpeg/libavcodec/ps2/Makefile - ffmpeg/libavcodec/sh4/Makefile - ffmpeg/libavcodec/sparc/Makefile - ffmpeg/libavutil/Makefile drivers/Makefile drivers/libdha/Makefile drivers/libdha/bin/Makefile --- avifile-0.7-0.7.45.orig/lib/Makefile.am +++ avifile-0.7-0.7.45/lib/Makefile.am @@ -2,9 +2,7 @@ DIST_SUBDIRS = aviplay aviread aviwrite noinst_HEADERS = Uncompressed.h COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\" \ - -I$(srcdir)/../ffmpeg/libavcodec \ - -I$(srcdir)/../ffmpeg/libavformat \ - -I$(srcdir)/../ffmpeg/libavutil + -I/usr/include/ffmpeg if AMM_USE_FAST_BUILD AVISOURCES = libaviplay.cpp AVILIBADD = --- avifile-0.7-0.7.45.orig/lib/aviread/Makefile.am +++ avifile-0.7-0.7.45/lib/aviread/Makefile.am @@ -45,22 +45,13 @@ libaviread_la_SOURCES = \ if AMM_LINK_SHARED FF_LIB = \ - ../../ffmpeg/libavformat/libaviplayavformat.la \ - ../../ffmpeg/libavcodec/libaviplayavcodec.la \ - ../../ffmpeg/libavutil/libaviplayavutil.la -else -FF_LIB = \ - ../../ffmpeg/libavformat/libavformat.la \ - ../../ffmpeg/libavcodec/libavcodec.la \ - ../../ffmpeg/libavutil/libavutil.la + -lavformat -lavcodec -lavutil endif libaviread_la_LIBADD = $(FF_LIB) AM_CPPFLAGS = $(LTNOPIC) \ -I$(srcdir)/../common \ - -I$(srcdir)/../../ffmpeg/libavformat \ - -I$(srcdir)/../../ffmpeg/libavcodec \ - -I$(srcdir)/../../ffmpeg/libavutil + -I/usr/include/ffmpeg MAINTAINERCLEANFILES = Makefile.in --- avifile-0.7-0.7.45.orig/plugins/Makefile.am +++ avifile-0.7-0.7.45/plugins/Makefile.am @@ -20,7 +20,7 @@ SUBDIRS = \ AM_CPPFLAGS = -Ilibac3pass -Ilibwin32 -Ilibwin32/audiodec \ -Ilibwin32/videocodec -Ilibwin32/loader \ - -Ilibwin32/loader/dshow -I../ffmpeg/libavcodec \ + -Ilibwin32/loader/dshow -I/usr/include/ffmpeg \ -DWIN32_PATH=\"$(WIN32_PATH)\" -D__WINE__ -DUNICODE \ -Ddbg_printf=__vprintf -DTRACE=__vprintf \ -Wmissing-prototypes -Wimplicit-function-declaration \ --- avifile-0.7-0.7.45.orig/plugins/libffmpeg/Makefile.am +++ avifile-0.7-0.7.45/plugins/libffmpeg/Makefile.am @@ -18,10 +18,7 @@ ffmpeg_la_LDFLAGS = -module -avoid-versi #KPROF_LIBS = -L/var/tmp/kprof/lib -lkprof #INSTRUMENT = -finstrument-functions AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT) \ - -I$(srcdir)/../../ffmpeg/libavcodec \ - -I$(srcdir)/../../ffmpeg/libavformat \ - -I$(srcdir)/../../ffmpeg/libavutil \ - -I$(srcdir)/../../ffmpeg + -I/usr/include/ffmpeg AM_CXXFLAGS = $(CXXRTTIEXCEPT) TEST_LIBS = ../../lib/libaviplay.la $(pkglib_LTLIBRARIES) $(SDL_LIBS) $(MPATROL_LIBS) $(EFENCE_LIBS) $(KPROF_LIBS)
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
.