Witam.
Uaktualnienie libmatroska z 0.6.3 do 0.7.4
Uwagi:
- zmiana linku Source0
- zmiana BR libebml-devel >= 0.6.4 na >= 0.7.2
- niezbędne zmiany w libmatroska-makefile.patch
--
Pozdrawiam
Karol "Charles" Krenski
Index: SPECS/libmatroska.spec
===================================================================
RCS file: /cvsroot/SPECS/libmatroska.spec,v
retrieving revision 1.15
diff -u -r1.15 libmatroska.spec
--- SPECS/libmatroska.spec 7 Apr 2004 09:17:01 -0000 1.15
+++ SPECS/libmatroska.spec 7 Nov 2004 14:13:17 -0000
@@ -2,16 +2,16 @@
Summary: Extensible Binary Meta Language access library
Summary(pl): Biblioteka dostępu rozszerzalnego metajęzyka binarnego
Name: libmatroska
-Version: 0.6.3
-Release: 4
+Version: 0.7.4
+Release: 1
License: GPL v2 or QPL
Group: Libraries
-Source0: http://matroska.free.fr/downloads/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5: 196801f6321badf0461c8760edd86841
+Source0: http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2
+# Source0-md5: a91b7a30141122edb02f9e42bbae69d9
Patch0: %{name}-makefile.patch
Patch1: %{name}-version_define.patch
URL: http://www.matroska.org/
-BuildRequires: libebml-devel >= 0.6.4
+BuildRequires: libebml-devel >= 0.7.2
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,7 +37,7 @@
Summary(pl): Nagłówki dla biblioteki matroska
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: libebml-devel >= 0.6.4
+Requires: libebml-devel >= 0.7.2
Requires: libstdc++-devel
%description devel
--- libmatroska-0.7.4/make/linux/Makefile.orig 2004-07-19 18:43:44.000000000 +0200
+++ libmatroska-0.7.4/make/linux/Makefile 2004-11-07 14:15:22.241711016 +0100
@@ -30,12 +30,14 @@
INSTALL_OPTS = -m 644
INSTALL_OPTS_LIB = -m 644
INSTALL_DIR_OPTS = -m 755
+LIBTOOL = libtool
+
+LIBEBML_INCLUDE_DIR=
+LIBEBML_LIB_DIR=
CWD=$(shell pwd)
# Options
-LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml
-LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
EXTENSION=.cpp
ifeq (yes,$(DEBUG))
@@ -50,10 +52,10 @@
# Librarires
INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
LIBS=
-MUX_LIBS=-lmatroska -lebml $(LIBICONV)
+MUX_LIBS=libmatroska.la -lebml $(LIBICONV)
# Names
-LIBRARY=libmatroska.a
+LIBRARY=libmatroska.la
# source-files
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
@@ -64,8 +66,8 @@
# files holding dependency information; replace .cxx extension with .dep
dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))
-# object files; replace .cxx extension with .o
-objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
+# object files; replace .cxx extension with .lo
+objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
-Wshadow
@@ -78,12 +80,11 @@
lib library: $(LIBRARY)
# Build rules
-%.o: %$(EXTENSION)
- $(CXX) -c $(COMPILEFLAGS) -o $@ $<
+%.lo: %$(EXTENSION)
+ $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
$(LIBRARY): $(objects)
- $(AR) $@ $(objects)
- $(RANLIB) $@
+ $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
clean: cleantest
rm -f $(objects)
@@ -101,33 +102,33 @@
test: test6 test8 test9
test6: test6.o $(LIBRARY)
- $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
+ $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
test6.o: $(MUX_SRC_DIR)test6.cpp
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
test8: test8.o $(LIBRARY)
- $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
+ $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
test8.o: $(MUX_SRC_DIR)test8.cpp
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
test9: test9.o $(LIBRARY)
- $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
+ $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
test9.o: $(TAG_SRC_DIR)test9.cpp
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
install: $(LIBRARY)
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+ $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
for i in $(INCLUDE_DIR)/*.h; do \
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
done
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
for i in $(INCLUDE_DIR)/c/*.h; do \
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
done
# DO NOT DELETE
_______________________________________________
pld-devel-pl mailing list
[EMAIL PROTECTED]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
