[packages/grass] - updated to 6.4.2 - updated soname,ncurses patches - added ffmpeg patch (update for ffmpeg up to 1.

qboosh qboosh at pld-linux.org
Sun Oct 21 21:21:26 CEST 2012 

commit 7f1c1d86a09fb3ca6c6f74ab8c74c92e665f7b5f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Oct 21 21:21:51 2012 +0200

    - updated to 6.4.2
    - updated soname,ncurses patches
    - added ffmpeg patch (update for ffmpeg up to 1.0)
    - added ac patch (fixes build with ac 2.5x+)

 grass-ac.patch     | 205 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 grass-ffmpeg.patch | 117 ++++++++++++++++++++++++++++++
 grass-soname.patch |  12 ++--
 grass.spec         |  56 +++++++++------
 ncurses.patch      |  33 +++------
 5 files changed, 372 insertions(+), 51 deletions(-)
---
diff --git a/grass.spec b/grass.spec
index 06eb33c..329bd5f 100644
--- a/grass.spec
+++ b/grass.spec
@@ -11,18 +11,22 @@
 Summary:	The Geographic Resources Analysis Support System
 Summary(pl.UTF-8):	System obsługujący analizę zasobów geograficznych
 Name:		grass
-Version:	6.4.1
+Version:	6.4.2
 Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://grass.osgeo.org/grass64/source/%{name}-%{version}.tar.gz
-# Source0-md5:	d8ca83d416b5b0cf2aa9d36c81a77b23
+# Source0-md5:	d3398d6b1e3a2ef19cfb6e39a5ae9919
 Patch0:		%{name}-soname.patch
 Patch1:		ncurses.patch
+Patch2:		%{name}-ffmpeg.patch
+Patch3:		%{name}-ac.patch
 URL:		http://grass.osgeo.org/
-BuildRequires:	Mesa-libGLw-devel
 %{?with_tcl:BuildRequires:	OpenGL-GLU-devel}
+BuildRequires:	OpenGL-GLw-devel
+BuildRequires:	autoconf >= 2.13
+BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	blas-devel
 BuildRequires:	cairo-devel
@@ -147,19 +151,19 @@ Pliki nagłówkowe i biblioteki statyczne systemu GRASS.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 cp -f lib/external/bwidget/CHANGES.txt bwidget.CHANGES.TXT
 cp -f lib/external/bwidget/README.grass bwidget.README.grass
 
 %build
-%if 0
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
-%endif
 CPPFLAGS="-I/usr/include/ncurses"
-%configure2_13 \
-%if "%{_lib}" != "lib"
+%configure \
+%if "%{_lib}" == "lib64"
         --enable-64bit \
 %endif
 	--enable-largefile \
@@ -211,11 +215,11 @@ sed -i -e 's,^GISBASE=.*,GISBASE=%{_libdir}/grass-%{gver},' $RPM_BUILD_ROOT%{_bi
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{pt_br,pt_BR}
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{zh,zh_CN}
 
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/AUTHORS
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/CHANGES
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/COPYING
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/GPL.TXT
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/REQUIREMENTS.html
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/AUTHORS
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/CHANGES
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/COPYING
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/GPL.TXT
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/REQUIREMENTS.html
 
 %find_lang %{name} --all-name
 
@@ -231,8 +235,9 @@ rm -rf $RPM_BUILD_ROOT
 #%doc dist.%{_target_platform}/docs/html
 %attr(755,root,root) %{_bindir}/gem64
 %attr(755,root,root) %{_bindir}/grass64
-%attr(755,root,root) %{_libdir}/libgrass_*.so
+%attr(755,root,root) %{_libdir}/libgrass_*.%{version}.so
 %dir %{_libdir}/grass-%{gver}
+%dir %{_libdir}/grass-%{gver}/*.csv
 %attr(755,root,root) %{_libdir}/grass-%{gver}/bin
 %dir %{_libdir}/grass-%{gver}/bwidget
 %{_libdir}/grass-%{gver}/bwidget/*.tcl
@@ -282,6 +287,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/grass-%{gver}/etc/i.ask
 %attr(755,root,root) %{_libdir}/grass-%{gver}/etc/i.find
 %attr(755,root,root) %{_libdir}/grass-%{gver}/etc/i.oif
+%attr(755,root,root) %{_libdir}/grass-%{gver}/etc/i.photo.*
 %{_libdir}/grass-%{gver}/etc/license
 %attr(755,root,root) %{_libdir}/grass-%{gver}/etc/lister
 %attr(755,root,root) %{_libdir}/grass-%{gver}/etc/lock
@@ -318,7 +324,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/grass-%{gver}/etc/nad
 %{_libdir}/grass-%{gver}/etc/ogr_csv
 %{_libdir}/grass-%{gver}/etc/paint
-%attr(755,root,root) %{_libdir}/grass-%{gver}/etc/photo.*
 %attr(755,root,root) %{_libdir}/grass-%{gver}/etc/poly_to_bmif
 %{_libdir}/grass-%{gver}/etc/proj-*.table
 %{_libdir}/grass-%{gver}/etc/projections
@@ -343,17 +348,18 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/grass-%{gver}/etc/wxpython
 %{_libdir}/grass-%{gver}/etc/wxpython/README
 %{_libdir}/grass-%{gver}/etc/wxpython/compat
-%{_libdir}/grass-%{gver}/etc/wxpython/gis_set.py
+%{_libdir}/grass-%{gver}/etc/wxpython/gis_set.py*
 %{_libdir}/grass-%{gver}/etc/wxpython/gui_modules
 %{_libdir}/grass-%{gver}/etc/wxpython/icons
-%{_libdir}/grass-%{gver}/etc/wxpython/images
 %attr(755,root,root) %{_libdir}/grass-%{gver}/etc/wxpython/scripts
-%{_libdir}/grass-%{gver}/etc/wxpython/wxgui.py
+%{_libdir}/grass-%{gver}/etc/wxpython/wxgui.py*
 %{_libdir}/grass-%{gver}/etc/wxpython/xml
 %{_libdir}/grass-%{gver}/fonts
 %attr(755,root,root) %{_libdir}/grass-%{gver}/scripts
 %dir %{_libdir}/grass-%{gver}/tools
 %attr(755,root,root) %{_libdir}/grass-%{gver}/tools/mkhtml.sh
+%dir %{_libdir}/grass-%{gver}/tools/g.html2man
+%attr(755,root,root) %{_libdir}/grass-%{gver}/tools/g.html2man/g.html2man
 %{_mandir}/man1/cairodriver.1*
 %{_mandir}/man1/d.*.1*
 %{_mandir}/man1/databaseintro.1*
@@ -376,9 +382,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/modhead.1*
 %{_mandir}/man1/modhist.1*
 %{_mandir}/man1/nviz.1*
-%{_mandir}/man1/nviz_cmd.1*
 %{_mandir}/man1/p.out.vrml.1*
-%{_mandir}/man1/photo.*.1*
 %{_mandir}/man1/pngdriver.1*
 %{_mandir}/man1/projectionintro.1*
 %{_mandir}/man1/psdriver.1*
@@ -412,13 +416,21 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/grass-%{gver}/etc/nviz2.2
 %{_libdir}/grass-%{gver}/etc/nviz2.2/bitmaps
 %attr(755,root,root) %{_libdir}/grass-%{gver}/etc/nviz2.2/nviz
+%dir %{_libdir}/grass-%{gver}/etc/nviz2.2/msgs
+%lang(de) %{_libdir}/grass-%{gver}/etc/nviz2.2/msgs/de.msg
+%lang(it) %{_libdir}/grass-%{gver}/etc/nviz2.2/msgs/it.msg
+%lang(ja) %{_libdir}/grass-%{gver}/etc/nviz2.2/msgs/ja.msg
+%lang(lv) %{_libdir}/grass-%{gver}/etc/nviz2.2/msgs/lv.msg
+%lang(pl) %{_libdir}/grass-%{gver}/etc/nviz2.2/msgs/pl.msg
 %dir %{_libdir}/grass-%{gver}/etc/nviz2.2/scripts
 %attr(755,root,root) %{_libdir}/grass-%{gver}/etc/nviz2.2/scripts/*
 %endif
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/libgrass_iostream.a
-%{_libdir}/libgrass_ismap.a
-%{_libdir}/libgrass_manage.a
+%attr(755,root,root) %{_libdir}/libgrass_*[!0-9].so
+%attr(755,root,root) %{_libdir}/libgrass_dig2.so
+%{_libdir}/libgrass_iostream.%{version}.a
+%{_libdir}/libgrass_ismap.%{version}.a
+%{_libdir}/libgrass_manage.%{version}.a
 %{_includedir}/grass64
diff --git a/grass-ac.patch b/grass-ac.patch
new file mode 100644
index 0000000..e93f4b1
--- /dev/null
+++ b/grass-ac.patch
@@ -0,0 +1,205 @@
+--- grass-6.4.2/lib/gis/Makefile.orig	2011-03-10 10:54:19.000000000 +0100
++++ grass-6.4.2/lib/gis/Makefile	2012-10-20 14:32:27.320283161 +0200
+@@ -12,7 +12,7 @@
+ 
+ LIB_OBJS := $(subst .c,.o,$(wildcard *.c))
+ LIB_OBJS := $(filter-out fmode.o dllmain.o,$(LIB_OBJS))
+-ifneq ($(MINGW),)
++ifeq ($(MINGW),yes)
+ LIB_OBJS := $(LIB_OBJS) dllmain.o fmode.o
+ endif
+ 
+@@ -34,7 +34,7 @@
+ 
+ ifneq ($(GDAL_DYNAMIC),)
+ EXTRA_CFLAGS += -DGDAL_DYNAMIC=1
+-ifneq ($(MINGW),)
++ifeq ($(MINGW),yes)
+ EXTRA_LIBS += -lkernel32
+ else
+ EXTRA_LIBS += $(DLLIB)
+--- grass-6.4.2/lib/init/Makefile.orig	2011-06-08 12:30:46.000000000 +0200
++++ grass-6.4.2/lib/init/Makefile	2012-10-20 14:33:08.316948107 +0200
+@@ -60,7 +60,7 @@
+ 		$(ETC)/html_browser_mac.sh
+ endif
+ 
+-ifneq ($(strip $(MINGW)),)
++ifeq ($(strip $(MINGW)),yes)
+ 	FILES += \
+ 		$(ETC)/Init.bat \
+ 		$(ETC)/winlocale$(EXE) \
+--- grass-6.4.2/Makefile.orig	2011-05-13 21:01:14.000000000 +0200
++++ grass-6.4.2/Makefile	2012-10-20 14:34:32.893611225 +0200
+@@ -49,7 +49,7 @@
+ 	man \
+ 	macosx
+ 
+-ifeq ($(strip $(MINGW)),)
++ifneq ($(strip $(MINGW)),yes)
+ 	SUBDIRS += gem
+ endif
+ 
+@@ -115,7 +115,7 @@
+ 	@if [ `cat "$(ERRORLOG)" | wc -l` -gt 8 ] ; then false ; else true ; fi
+ 
+ manifests:
+-ifneq ($(strip $(MINGW)),)
++ifeq ($(strip $(MINGW)),yes)
+ 	find $(ARCH_DISTDIR) -type f -name '*.exe' | \
+ 	while read file ; do \
+ 	    cmd=`basename "$$file" .exe` ; \
+@@ -278,7 +278,7 @@
+ 	-cd ${GISBASE} ; tar cBf - driver | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
+ 	-cd ${GISBASE} ; tar cBf - etc | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
+ 	-cd ${GISBASE} ; tar cBf - fonts | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
+-ifeq ($(strip $(MINGW)),)
++ifneq ($(strip $(MINGW)),yes)
+ 	-cd ${GISBASE} ; tar cBf - man | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
+ endif
+ 	-cd ${GISBASE} ; tar cBf - scripts | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
+@@ -299,7 +299,7 @@
+ 	-sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/fontcap > ${INST_DIR}/etc/fontcap
+ 	@##### -chmod -R 1777 ${INST_DIR}/locks 2>/dev/null
+ 	-chmod -R a+rX ${INST_DIR} 2>/dev/null
+-ifeq ($(strip $(MINGW)),)
++ifneq ($(strip $(MINGW)),yes)
+ 	@#GEM installation
+ 	-tar cBf - gem/skeleton | (cd ${INST_DIR}/etc ; tar xBf - ) 2>/dev/null
+ 	-${INSTALL} gem/gem$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR) ${BINDIR} 2>/dev/null
+--- grass-6.4.2/lib/python/ctypes/Makefile.orig	2011-05-03 21:27:16.000000000 +0200
++++ grass-6.4.2/lib/python/ctypes/Makefile	2012-10-20 14:35:23.370275773 +0200
+@@ -57,7 +57,7 @@
+ CTYPESFLAGS = --cpp "$(CC) -E $(CPPFLAGS) $(LFS_CFLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(DEFS) $(EXTRA_INC) $(INC)"
+ EXTRA_CLEAN_FILES := $(foreach M,$(MODULES),$(M).py) $(wildcard ctypesgencore/*.pyc) $(wildcard ctypesgencore/*/*.pyc)
+ 
+-ifneq ($(MINGW),)
++ifeq ($(MINGW),yes)
+ INTLLIB = -lintl3
+ endif
+ 
+--- grass-6.4.2/visualization/nviz/Makefile.orig	2008-12-23 15:05:57.000000000 +0100
++++ grass-6.4.2/visualization/nviz/Makefile	2012-10-20 14:36:21.746939990 +0200
+@@ -9,7 +9,7 @@
+ PROG=nviz
+ INSTALL_DIR=$(GISBASE)/etc/$(NV_VER)
+ 
+-ifneq ($(strip $(MINGW)),)
++ifeq ($(strip $(MINGW)),yes)
+ 	FIND = find
+ else
+ 	FIND = find -L
+@@ -36,7 +36,7 @@
+ 	-$(MKDIR) $(INSTALL_DIR)
+ 	$(INSTALL) src/nvwish$(EXE) $(INSTALL_DIR)/$(PROG)$(EXE)
+ 	$(INSTALL) scripts/$(PROG) $(GISBASE)/bin
+-ifneq ($(strip $(MINGW)),)
++ifeq ($(strip $(MINGW)),yes)
+ 	$(INSTALL) scripts/nviz.bat $(GISBASE)/bin
+ endif
+ 	-$(MKDIR) $(INSTALL_DIR)/scripts
+--- grass-6.4.2/visualization/nviz/html/Makefile.orig	2008-12-23 15:05:57.000000000 +0100
++++ grass-6.4.2/visualization/nviz/html/Makefile	2012-10-20 14:36:43.426939080 +0200
+@@ -5,7 +5,7 @@
+ 
+ GRASS_NVIZ_DOCS=$(GISBASE)/docs/html/nviz
+ 
+-ifneq ($(strip $(MINGW)),)
++ifeq ($(strip $(MINGW)),yes)
+ 	FIND = find
+ else
+ 	FIND = find -L
+--- grass-6.4.2/gui/tcltk/Makefile.orig	2009-05-11 21:22:34.000000000 +0200
++++ grass-6.4.2/gui/tcltk/Makefile	2012-10-20 14:39:10.970266222 +0200
+@@ -2,7 +2,7 @@
+ 
+ SUBDIRS = gis.m
+ 
+-ifndef MINGW
++ifneq ($(MINGW),yes)
+ SUBDIRS += d.m
+ endif
+ 
+--- grass-6.4.2/gui/scripts/Makefile.orig	2010-01-15 15:41:17.000000000 +0100
++++ grass-6.4.2/gui/scripts/Makefile	2012-10-20 14:39:41.100264957 +0200
+@@ -2,7 +2,7 @@
+ 
+ include $(MODULE_TOPDIR)/include/Make/Dir.make
+ 
+-ifdef MINGW
++ifeq ($(MINGW),yes)
+ SCRIPT_ACTIONS += create.bat
+ endif
+ 
+--- grass-6.4.2/raster/Makefile.orig	2011-04-22 16:09:26.000000000 +0200
++++ grass-6.4.2/raster/Makefile	2012-10-20 14:40:31.790262831 +0200
+@@ -129,7 +129,7 @@
+ 
+ include $(MODULE_TOPDIR)/include/Make/Platform.make
+ 
+-ifndef MINGW
++ifneq ($(MINGW),yes)
+     SUBDIRS += r.li
+ endif
+ 
+--- grass-6.4.2/vector/v.transform/Makefile.orig	2008-12-19 21:28:57.000000000 +0100
++++ grass-6.4.2/vector/v.transform/Makefile	2012-10-20 14:40:59.673594995 +0200
+@@ -5,7 +5,7 @@
+ 
+ include $(MODULE_TOPDIR)/include/Make/Module.make
+ 
+-ifdef MINGW
++ifeq ($(MINGW),yes)
+ EXTRA_LIB=
+ else
+ EXTRA_LIB=$(VASKLIB) $(CURSES)
+--- grass-6.4.2/include/Make/Grass.make.in.orig	2011-04-18 20:13:38.000000000 +0200
++++ grass-6.4.2/include/Make/Grass.make.in	2012-10-20 14:58:30.123550911 +0200
+@@ -86,7 +86,7 @@
+ VECT_CFLAGS =  $(GDALCFLAGS) $(GEOSCFLAGS)
+ 
+ # Object with _fmode which must be linked to each executable on Windows
+-ifdef MINGW
++ifeq ($(MINGW),yes)
+   FMODE_OBJ = $(MODULE_TOPDIR)/lib/gis/$(OBJDIR)/fmode.o
+ endif
+ 
+--- grass-6.4.2/include/Make/Shlib.make.orig	2012-10-20 14:41:45.603593065 +0200
++++ grass-6.4.2/include/Make/Shlib.make	2012-10-20 14:59:13.833549075 +0200
+@@ -3,7 +3,7 @@
+ SHLIB = $(ARCH_LIBDIR)/$(SHLIB_PREFIX)$(SHLIB_NAME)$(SHLIB_SUFFIX)
+ 
+ # Object that calls _setfmode(_O_BINARY) which must be linked to each DLL on Windows
+-ifdef MINGW
++ifeq ($(MINGW),yes)
+ ifneq ($(SHLIB_NAME),$(DATETIME_LIBNAME))
+ ifneq ($(SHLIB_NAME),$(GIS_LIBNAME))
+   DLLMAIN_OBJ = $(MODULE_TOPDIR)/lib/gis/$(OBJDIR)/dllmain.o
+@@ -16,7 +16,7 @@
+ 
+ $(SHLIB): $(SHLIB_OBJS)
+ 	$(SHLIB_LD) -o $@ -Wl,-soname,$(notdir $@) $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ)
+-ifndef MINGW
++ifneq ($(MINGW),yes)
+ 	(cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
+ endif
+ 
+--- grass-6.4.2/include/Make/Script.make.orig	2009-07-05 14:48:37.000000000 +0200
++++ grass-6.4.2/include/Make/Script.make	2012-10-20 14:59:58.503547201 +0200
+@@ -11,7 +11,7 @@
+ include $(MODULE_TOPDIR)/include/Make/Rules.make
+ 
+ SCRIPT_ACTIONS = $(SCRIPT)
+-ifdef MINGW
++ifeq ($(MINGW),yes)
+ SCRIPT_ACTIONS += $(BIN)/$(PGM).bat
+ endif
+ 
+--- grass-6.4.2/general/g.version/Makefile.orig	2011-04-18 20:13:39.000000000 +0200
++++ grass-6.4.2/general/g.version/Makefile	2012-10-21 08:48:28.460856763 +0200
+@@ -29,4 +29,4 @@
+ 	sed -e 's/^\(.*\)$$/"\1\\n"/' $< > $@
+ 
+ $(OBJDIR)/confparms.h: $(MODULE_TOPDIR)/config.status
+-	sed -n '7s/^#\(.*\)$$/"\1"/p' $< > $@
++	sed -n '7s/^#\(.*\)$$/"\1"/p;s/^ac_cs_config="\(.*"\)$$/".\/configure \1/p' $< > $@
diff --git a/grass-ffmpeg.patch b/grass-ffmpeg.patch
new file mode 100644
index 0000000..905bef0
--- /dev/null
+++ b/grass-ffmpeg.patch
@@ -0,0 +1,117 @@
+--- grass-6.4.2/configure.in.orig	2012-10-20 12:50:17.287207081 +0200
++++ grass-6.4.2/configure.in	2012-10-20 13:02:02.273844162 +0200
+@@ -1125,7 +1125,7 @@
+ LOC_CHECK_LIB_PATH(ffmpeg, FFMPEG, FFMPEGLIBPATH)
+ 
+ LOC_CHECK_LIBS(avutil, av_free, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB,,,,$MATHLIB)
+-LOC_CHECK_LIBS(avcodec, avcodec_init, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
+-LOC_CHECK_LIBS(avformat, av_set_parameters, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
++LOC_CHECK_LIBS(avcodec, avcodec_register_all, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
++LOC_CHECK_LIBS(avformat, avformat_write_header, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
+ 
+ fi # $USE_FFMPEG
+--- grass-6.4.2/lib/ogsf/gsd_img_mpeg.c.orig	2009-01-12 08:46:29.000000000 +0100
++++ grass-6.4.2/lib/ogsf/gsd_img_mpeg.c	2012-10-21 11:07:46.300506016 +0200
+@@ -66,7 +66,7 @@
+ 
+     c = st->codec;
+     c->codec_id = codec_id;
+-    c->codec_type = CODEC_TYPE_VIDEO;
++    c->codec_type = AVMEDIA_TYPE_VIDEO;
+ 
+     /* put sample parameters */
+     c->bit_rate = 400000;
+@@ -97,7 +97,7 @@
+ 	c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ 
+     c->flags |= CODEC_FLAG_QSCALE;
+-    c->global_quality = st->quality = FF_QP2LAMBDA * 10;
++    c->global_quality = FF_QP2LAMBDA * 10;
+ 
+     return st;
+ }
+@@ -215,7 +215,7 @@
+ 
+ 	av_init_packet(&pkt);
+ 
+-	pkt.flags |= PKT_FLAG_KEY;
++	pkt.flags |= AV_PKT_FLAG_KEY;
+ 	pkt.stream_index = st->index;
+ 	pkt.data = (uint8_t *) picture;
+ 	pkt.size = sizeof(AVPicture);
+@@ -236,7 +236,7 @@
+ 		av_rescale_q(c->coded_frame->pts, c->time_base,
+ 			     st->time_base);
+ 	    if (c->coded_frame->key_frame)
+-		pkt.flags |= PKT_FLAG_KEY;
++		pkt.flags |= AV_PKT_FLAG_KEY;
+ 	    pkt.stream_index = st->index;
+ 	    pkt.data = video_outbuf;
+ 	    pkt.size = out_size;
+@@ -301,10 +301,10 @@
+     av_register_all();
+ 
+     /* auto detect the output format from the name. default is mpeg. */
+-    fmt = guess_format(NULL, filename, NULL);
++    fmt = av_guess_format(NULL, filename, NULL);
+     if (!fmt) {
+ 	G_warning(_("Unable to deduce output format from file extension: using MPEG"));
+-	fmt = guess_format("mpeg", NULL, NULL);
++	fmt = av_guess_format("mpeg", NULL, NULL);
+     }
+     if (!fmt) {
+ 	G_warning(_("Unable to find suitable output format"));
+@@ -312,7 +312,7 @@
+     }
+ 
+     /* allocate the output media context */
+-    oc = av_alloc_format_context();
++    oc = avformat_alloc_context();
+     if (!oc) {
+ 	G_warning(_("Out of memory"));
+ 	return (-1);
+@@ -332,13 +332,7 @@
+ 	    add_video_stream(oc, fmt->video_codec, (r - l + 1), (t - b + 1));
+     }
+ 
+-    /* set the output parameters (must be done even if no parameters). */
+-    if (av_set_parameters(oc, NULL) < 0) {
+-	G_warning(_("Invalid output format parameters"));
+-	return (-1);
+-    }
+-
+-    dump_format(oc, 0, filename, 1);
++    av_dump_format(oc, 0, filename, 1);
+ 
+     /* now that all the parameters are set, we can open the audio and
+        video codecs and allocate the necessary encode buffers */
+@@ -347,14 +341,14 @@
+ 
+     /* open the output file, if needed */
+     if (!(fmt->flags & AVFMT_NOFILE)) {
+-	if (url_fopen(&oc->pb, filename, URL_WRONLY) < 0) {
++	if (avio_open(&oc->pb, filename, AVIO_FLAG_WRITE) < 0) {
+ 	    G_warning(_("Unable to open <%s>"), filename);
+ 	    return (-1);
+ 	}
+     }
+ 
+     /* write the stream header, if any */
+-    av_write_header(oc);
++    avformat_write_header(oc, NULL);
+ 
+ 
+ #else
+@@ -436,11 +430,7 @@
+ 
+     if (!(fmt->flags & AVFMT_NOFILE)) {
+ 	/* close the output file */
+-#if (LIBAVFORMAT_VERSION_INT>>16) < 52
+-	url_fclose(&oc->pb);
+-#else
+-	url_fclose(oc->pb);
+-#endif
++	avio_close(oc->pb);
+     }
+ 
+     /* free the stream */
diff --git a/grass-soname.patch b/grass-soname.patch
index 8c150ed..1aa8913 100644
--- a/grass-soname.patch
+++ b/grass-soname.patch
@@ -1,11 +1,11 @@
---- grass-6.4.0/include/Make/Shlib.make.orig	2009-03-08 09:48:33.000000000 +0100
-+++ grass-6.4.0/include/Make/Shlib.make	2010-11-03 21:42:06.003104128 +0100
+--- grass-6.4.2/include/Make/Shlib.make.orig	2012-10-20 11:25:11.634088013 +0200
++++ grass-6.4.2/include/Make/Shlib.make	2012-10-20 11:29:05.027411551 +0200
 @@ -15,7 +15,7 @@
  LDFLAGS += $(SHLIB_LDFLAGS)
  
  $(SHLIB): $(SHLIB_OBJS)
--	$(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ) && \
-+	$(SHLIB_LD) -o $@ -Wl,-soname,$(notdir $@) $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ) && \
+-	$(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ)
++	$(SHLIB_LD) -o $@ -Wl,-soname,$(notdir $@) $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ)
+ ifndef MINGW
  	(cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
- 
- shlib: $(SHLIB)
+ endif
diff --git a/ncurses.patch b/ncurses.patch
index 6994f6a..3d0f7c4 100644
--- a/ncurses.patch
+++ b/ncurses.patch
@@ -14,52 +14,39 @@ also as regeneration fails, we change also configure
      AC_MSG_ERROR([*** Unable to locate curses library.])
      CURSESLIB=
  ])])
---- grass-6.4.0/configure.orig	2011-03-10 10:54:19.000000000 +0100
-+++ grass-6.4.0/configure	2011-07-05 12:50:33.000000000 +0200
-@@ -5716,12 +5716,12 @@ EOF
+--- grass-6.4.2/configure.orig	2012-02-06 11:16:07.000000000 +0100
++++ grass-6.4.2/configure	2012-10-20 12:49:39.603875329 +0200
+@@ -5758,12 +5758,12 @@
  
  echo "$ac_t""$CURSES_MAXY" 1>&6
  
 -echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
--echo "configure:5721: checking for initscr in -lncurses" >&5
+-echo "configure:5763: checking for initscr in -lncurses" >&5
 +echo $ac_n "checking for initscr in -lncursesw""... $ac_c" 1>&6
-+echo "configure:5721: checking for initscr in -lncursesw" >&5
++echo "configure:5763: checking for initscr in -lncursesw" >&5
  ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
  
  ac_save_LIBS="$LIBS"
 -LIBS="-lncurses  $LIBS"
 +LIBS="-lncursesw  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 5727 "configure"
+ #line 5769 "configure"
  #include "confdefs.h"
-@@ -5748,16 +5748,16 @@ LIBS="$ac_save_LIBS"
+@@ -5790,7 +5790,7 @@
  
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  CURSESLIB=-lncurses
-+  CURSESLIB="-lncursesw -ltinfo"
++  CURSESLIB=-lncursesw
  else
    echo "$ac_t""no" 1>&6
  
--echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
--echo "configure:5757: checking for initscr in -lcurses" >&5
--ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-+echo "configure:5757: checking for initscr in -lncurses" >&5
-+ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
- 
- ac_save_LIBS="$LIBS"
--LIBS="-lcurses  $LIBS"
-+LIBS="-lncurses  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 5763 "configure"
- #include "confdefs.h"
-@@ -5784,7 +5784,7 @@ LIBS="$ac_save_LIBS"
+@@ -5826,7 +5826,7 @@
  
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  CURSESLIB=-lcurses
-+  CURSESLIB="-lncurses -ltinfo"
++  CURSESLIB=-lncurses
  else
    echo "$ac_t""no" 1>&6
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/grass.git/commitdiff/7f1c1d86a09fb3ca6c6f74ab8c74c92e665f7b5f

More information about the pld-cvs-commit mailing list