Author: qboosh Date: Fri Apr 1 18:39:53 2011 GMT Module: packages Tag: HEAD ---- Log message: - added install-is-not-clean patch, pass BUILD_INSTALL - now nothing gets recompiled on make install - release 1
---- Files affected: packages/gpac: gpac.spec (1.31 -> 1.32) , gpac-install-is-not-clean.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gpac/gpac.spec diff -u packages/gpac/gpac.spec:1.31 packages/gpac/gpac.spec:1.32 --- packages/gpac/gpac.spec:1.31 Wed Mar 30 20:13:05 2011 +++ packages/gpac/gpac.spec Fri Apr 1 20:39:47 2011 @@ -16,7 +16,7 @@ Summary(pl.UTF-8): GPAC - implementacja standardu MPEG-4 Systems (ISO/IEC 14496-1) Name: gpac Version: 0.4.5 -Release: 0.3 +Release: 1 License: LGPL v2+ Group: Applications/Multimedia Source0: http://downloads.sourceforge.net/gpac/%{name}-%{version}.tar.gz @@ -27,6 +27,7 @@ Patch3: %{name}-xulrunner.patch Patch4: %{name}-amr.patch Patch5: %{name}-ffmpeg.patch +Patch6: %{name}-install-is-not-clean.patch URL: http://gpac.sourceforge.net/ BuildRequires: SDL-devel BuildRequires: a52dec-libs-devel @@ -123,6 +124,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %if %{with amr} sed -i -e 's/amr_\([nw]b\)_ft/amr\1/' modules/amr_float_dec/amr_float_dec.c @@ -158,6 +160,8 @@ --xulsdk-path="/usr/include/xulrunner -I/usr/include/nspr" %{__make} -j1 \ + BUILD_INSTALL=yes \ + CXX="%{__cxx}" \ libdir=%{_lib} %install @@ -211,6 +215,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.32 2011/04/01 18:39:47 qboosh +- added install-is-not-clean patch, pass BUILD_INSTALL - now nothing gets recompiled on make install +- release 1 + Revision 1.31 2011/03/30 18:13:05 qboosh - added ffmpeg patch, build with system ffmpeg (0.6.2 build-tested) ================================================================ Index: packages/gpac/gpac-install-is-not-clean.patch diff -u /dev/null packages/gpac/gpac-install-is-not-clean.patch:1.1 --- /dev/null Fri Apr 1 20:39:53 2011 +++ packages/gpac/gpac-install-is-not-clean.patch Fri Apr 1 20:39:47 2011 @@ -0,0 +1,21 @@ +--- gpac/applications/mp4client/Makefile.orig 2008-11-24 09:44:26.000000000 +0100 ++++ gpac/applications/mp4client/Makefile 2011-04-01 18:56:48.041739787 +0200 +@@ -87,7 +87,7 @@ MP4Client$(EXE): $(OBJS) + clean: + rm -f $(OBJS) ../../bin/gcc/$(PROG) + +-install: clean ++install: + $(MAKE) -override BUILD_INSTALL=yes all + install -m 755 $(INSTFLAGS) ../../bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin" + +--- gpac/applications/osmo4_wx/Makefile.orig 2008-11-24 09:48:32.000000000 +0100 ++++ gpac/applications/osmo4_wx/Makefile 2011-04-01 18:57:49.669735597 +0200 +@@ -63,7 +63,6 @@ ifeq ($(CONFIG_DARWIN),yes) + $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/MacOS + echo -n 'APPLOsm4' > $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/PkgInfo + else +- rm -f wxOsmo4.o + $(MAKE) -override BUILD_INSTALL=yes all + mkdir -p $(DESTDIR)$(prefix)/bin + install -m 755 $(INSTFLAGS) ../../bin/gcc/Osmo4 "$(DESTDIR)$(prefix)/bin" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpac/gpac.spec?r1=1.31&r2=1.32&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
