Skip to content

V
vlc
Commit 66f3b7b9 authored by Jean-Paul Saman's avatar Jean-Paul Saman Committed by Jean-Paul Saman
Browse files
Options

Fixes for use of COMPRESS_TGZ

parent c3266418
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
extras/contrib/src/Makefile
View file @ 66f3b7b9
...@@ -1001,7 +1001,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2 ...@@ -1001,7 +1001,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
# ffmpeg # ffmpeg
# *************************************************************************** # ***************************************************************************
ffmpeg-rpm: ffmpeg.tar.gz ffmpeg-rpm: ffmpeg.tgz
$(RPM_PREPARE) $(RPM_PREPARE)
# sed -e 's/$$(FFMPEGCONF)/$(FFMPEGCONF)/' -e 's/$$(CFLAGS)/$(CFLAGS)/' -e 's/$$(FFMPEG_CFLAGS)/$(FFMPEG_CFLAGS)/' -i.orig rpm/SPECS/ffmpeg.spec # sed -e 's/$$(FFMPEGCONF)/$(FFMPEGCONF)/' -e 's/$$(CFLAGS)/$(CFLAGS)/' -e 's/$$(FFMPEG_CFLAGS)/$(FFMPEG_CFLAGS)/' -i.orig rpm/SPECS/ffmpeg.spec
$(RPM_BUILD_SPEC) $(RPM_BUILD_SPEC)
...@@ -1312,6 +1312,7 @@ libdca: ...@@ -1312,6 +1312,7 @@ libdca:
$(SVN) co $(LIBDCA_SVN) -r 35 libdca $(SVN) co $(LIBDCA_SVN) -r 35 libdca
(cd $@; ./bootstrap) (cd $@; ./bootstrap)
$(COMPRESS_TGZ) $(COMPRESS_TGZ)
mv libdca.tgz libdca-svn_35.tar.gz
.libdca: libdca .libdca: libdca
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install) (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
......
extras/contrib/src/Patches/ffmpeg.spec
View file @ 66f3b7b9
...@@ -7,7 +7,7 @@ Version: svn_10886 ...@@ -7,7 +7,7 @@ Version: svn_10886
Release: 5 Release: 5
Group: System/Libraries Group: System/Libraries
License: LGPL License: LGPL
Source: %{name}.tar.gz Source: %{name}.tgz
URL: svn://svn.mplayerhq.hu/ffmpeg/trunk URL: svn://svn.mplayerhq.hu/ffmpeg/trunk
BuildRoot: /var/tmp/%{name}-%{version}-root BuildRoot: /var/tmp/%{name}-%{version}-root
BuildRequires: faac-devel, lame-devel, a52dec-devel, amrnb-devel, amrwb-devel BuildRequires: faac-devel, lame-devel, a52dec-devel, amrnb-devel, amrwb-devel
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment