haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

libebml & libmatroska: bump version.

Browse Source 
* switch to autotools.
This commit is contained in:
Jerome Duval
2015-01-04 22:23:07 +00:00
committed by Markus Himmel
parent dbe32bbea5
commit 9da1fbc618
9 changed files with 94 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dev-libs/libebml/libebml-1.0.0.recipe
View File

@@ -1,25 +0,0 @@
DESCRIPTION="libebml is a C++ library to parse EBML content (read/write)."
HOMEPAGE="http://www.matroska.org/"
SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.0.0.tar.bz2"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
CHECKSUM_MD5="6d438f03d8928d83a2d120ed02705f03"
BUILD()
{
cd libebml-1.0.0/make/linux
make
}
INSTALL()
{
cd libebml-1.0.0/make/linux
if [ -n ${DESTDIR} ];then
make install DESTDIR="${DESTDIR}"
else
make install
fi
}
LICENSE="GNU LGPL v2.1"
COPYRIGHT="2005-2009 CoreCodec, Inc."

46
dev-libs/libebml/libebml-1.3.0.recipe → dev-libs/libebml/libebml-1.3.1.recipe
View File

@@ -1,64 +1,68 @@
SUMMARY="libebml is a C++ library to parse EBML content (read/write)."
DESCRIPTION="libebml is a C++ library to parse EBML content (read/write)."
HOMEPAGE="http://www.matroska.org/"
SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.3.0.tar.bz2"
CHECKSUM_SHA256="83b074d6b62715aa0080406ea84d33df2e44b5d874096640233a4db49b8096de"
SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.3.1.tar.bz2"
CHECKSUM_SHA256="195894b31aaca55657c9bc157d744f23b0c25597606b97cfa5a9039c4b684295"
REVISION="1"
LICENSE="GNU LGPL v2.1"
COPYRIGHT="2005-2013 CoreCodec, Inc."
ARCHITECTURES="x86_gcc2 x86 ?x86_64"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libebml$secondaryArchSuffix = $portVersion
lib:libebml$secondaryArchSuffix = 4
lib:libebml$secondaryArchSuffix = 4.0.0 compat >= 4
"
REQUIRES="
haiku${secondaryArchSuffix}
lib:libstdc++${secondaryArchSuffix}
"
if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
PATCHES="
libebml-$portVersion.patchset
"
else
REQUIRES+="
lib:libgcc_s${secondaryArchSuffix}
"
fi
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
cmd:libtool
cmd:make
cmd:sed
"
PATCH()
{
sed -i 's/^ifeq (BeOS/ifeq (Haiku/g' make/linux/Makefile
sed -i "s,/boot/home/config,$prefix,g" make/linux/Makefile
sed -i "s,^\(libdir\)=\(.*\)$,\1=$libDir,g" make/linux/Makefile
sed -i "s,^\(includedir\)=\(.*\)$,\1=$includeDir/ebml,g" make/linux/Makefile
sed -i 's/-Wextra//g' make/linux/Makefile
sed -i 's/\(#elif defined(__BEOS__)\)/\1 || defined(__HAIKU__)/g' \
ebml/c/libebml_t.h
}
BUILD()
{
cd make/linux
autoreconf -f -i
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
cd make/linux
make install
prepareInstalledDevelLibs libebml
fixPkgconfig
packageEntries devel $developDir
}
PROVIDES_devel="
libebml${secondaryArchSuffix}_devel = $portVersion
devel:libebml$secondaryArchSuffix = 4
devel:libebml$secondaryArchSuffix = 4.0.0 compat >= 4
"
REQUIRES_devel="
libebml$secondaryArchSuffix == $portVersion base

21
dev-libs/libebml/patches/libebml-0.7.8-haiku.diff
View File

@@ -1,21 +0,0 @@
diff -urN libebml-0.7.8/ebml/c/libebml_t.h libebml-0.7.8-haiku/ebml/c/libebml_t.h
--- libebml-0.7.8/ebml/c/libebml_t.h 2009-03-01 02:10:48.000000000 +0000
+++ libebml-0.7.8-haiku/ebml/c/libebml_t.h 2009-03-01 02:06:42.000000000 +0000
@@ -72,7 +72,7 @@
typedef uint16_t uint16;
typedef uint8_t uint8;
# endif // __GNUC__
-#elif defined(__BEOS__)
+#elif defined(__BEOS__) || defined(__HAIKU__)
#include <SupportDefs.h>
#elif defined(DJGPP) /* SL : DJGPP doesn't support POSIX types ???? */
typedef signed long long int64;
@@ -98,7 +98,7 @@
typedef uint32_t uint32;
typedef uint16_t uint16;
typedef uint8_t uint8;
-#elif defined(__BEOS__)
+#elif defined(__BEOS__) || defined(__HAIKU__)
# include <support/SupportDefs.h>
#else // anything else (Linux, BSD, ...)
# include <sys/types.h>

67
dev-libs/libebml/patches/libebml-1.0.0.patch
View File

@@ -1,67 +0,0 @@
diff -urN libebml-1.0.0/ebml/c/libebml_t.h libebml-1.0.0-haiku/ebml/c/libebml_t.h
--- libebml-1.0.0/ebml/c/libebml_t.h 2010-03-23 11:58:36.007077888 +0000
+++ libebml-1.0.0-haiku/ebml/c/libebml_t.h 2010-06-30 15:54:51.796131328 +0000
@@ -72,7 +72,7 @@
typedef uint16_t uint16;
typedef uint8_t uint8;
# endif // __GNUC__
-#elif defined(__BEOS__)
+#elif defined(__BEOS__) || defined(__HAIKU__)
#include <SupportDefs.h>
#elif defined(DJGPP) /* SL : DJGPP doesn't support POSIX types ???? */
typedef signed long long int64;
@@ -98,7 +98,7 @@
typedef uint32_t uint32;
typedef uint16_t uint16;
typedef uint8_t uint8;
-#elif defined(__BEOS__)
+#elif defined(__BEOS__) || defined (__HAIKU__)
# include <support/SupportDefs.h>
#else // anything else (Linux, BSD, ...)
# include <inttypes.h>
diff -urN libebml-1.0.0/make/linux/Makefile libebml-1.0.0-destdir/make/linux/Makefile
--- libebml-1.0.0/make/linux/Makefile 2010-06-04 08:44:54.060817408 +0000
+++ libebml-1.0.0-destdir/make/linux/Makefile 2010-09-22 12:58:40.962854912 +0000
@@ -13,6 +13,9 @@
# BeOS wants the libs and headers in /boot/home/config
ifeq (BeOS,$(shell uname -s))
prefix=/boot/home/config
+# Haiku wants the libs and headers in /boot/common
+else ifeq (Haiku,$(shell uname -s))
+prefix=/boot/common
else
prefix=/usr/local
endif
@@ -122,23 +125,23 @@
endif
install_headers:
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
+ $(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
install_staticlib: $(LIBRARY)
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
install_sharedlib: $(LIBRARY_SO)
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
+ ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
ifneq ($(wildcard .depend),)

22
dev-libs/libebml/patches/libebml-1.3.1.patchset Normal file
View File

@@ -0,0 +1,22 @@
From dfad87a8cda696eba7c4a96ab898705978a0cec0 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 4 Jan 2015 21:37:55 +0000
Subject: gcc2 fix
diff --git a/Makefile.am b/Makefile.am
index 9b10ee8..3e11510 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -I${top_srcdir}
-AM_CXXFLAGS = -Wall -Wextra -Wno-unknown-pragmas -Wshadow
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas -Wshadow
if ENABLE_DEBUG
AM_CPPFLAGS += -DDEBUG
AM_CXXFLAGS += -g
--
1.8.3.4

25
media-libs/libmatroska/libmatroska-1.0.0.recipe
View File

@@ -1,25 +0,0 @@
DESCRIPTION="libmatroska is a C++ libary to parse Matroska files."
HOMEPAGE="http://www.matroska.org/"
SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-1.0.0.tar.bz2"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/libebml >= 1.0.0"
CHECKSUM_MD5="4efcf3945b17a6f0320cf1aaa326a4de"
BUILD()
{
cd libmatroska-1.0.0/make/linux
make PREFIX=/boot/common
}
INSTALL()
{
cd libmatroska-1.0.0/make/linux
if [ -n ${DESTDIR} ];then
make install DESTDIR="${DESTDIR}"
else
make install
fi
}
LICENSE="GNU LGPL v2.1"
COPYRIGHT="2005-2009 CoreCodec, Inc."

48
media-libs/libmatroska/libmatroska-1.4.1.recipe → media-libs/libmatroska/libmatroska-1.4.2.recipe
View File

@@ -1,67 +1,69 @@
SUMMARY="libmatroska is a C++ libary to parse Matroska files."
DESCRIPTION="libmatroska is a C++ libary to parse Matroska files."
HOMEPAGE="http://www.matroska.org/"
SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-1.4.1.tar.bz2"
CHECKSUM_SHA256="086f21873e925679babdabf793c3bb85c353d0cd79423543a3355e08e8a4efb7"
SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-$portVersion.tar.bz2"
CHECKSUM_SHA256="bea10320f1f1fd121bbd7db9ffc77b2518e8269f00903549c5425478bbf8393f"
REVISION="1"
LICENSE="GNU LGPL v2.1"
COPYRIGHT="2005-2013 CoreCodec, Inc."
ARCHITECTURES="x86_gcc2 x86 ?x86_64"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libmatroska$secondaryArchSuffix = $portVersion
lib:libmatroska$secondaryArchSuffix = 6
lib:libmatroska$secondaryArchSuffix = 6.0.0 compat >= 6
"
REQUIRES="
haiku${secondaryArchSuffix}
lib:libebml$secondaryArchSuffix
lib:libstdc++$secondaryArchSuffix
"
if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
PATCHES="
libmatroska-$portVersion.patchset
"
else
REQUIRES+="
lib:libgcc_s${secondaryArchSuffix}
"
fi
BUILD_REQUIRES="
devel:libebml$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
cmd:libtool
cmd:make
cmd:sed
"
PATCH()
{
sed -i 's/^ifeq (BeOS/ifeq (Haiku/g' make/linux/Makefile
sed -i "s,/boot/home/config,$prefix,g" make/linux/Makefile
sed -i "s,^\(libdir\)=\(.*\)$,\1=$libDir,g" make/linux/Makefile
sed -i "s,^\(includedir\)=\(.*\)$,\1=$includeDir/matroska,g" \
make/linux/Makefile
sed -i 's/-Wextra//g' make/linux/Makefile
}
BUILD()
{
cd make/linux
make $jobArgs \
LIBEBML_INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir \
LIBEBML_LIB_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir
autoreconf -f -i
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
cd make/linux
make install
prepareInstalledDevelLibs libmatroska
fixPkgconfig
packageEntries devel $developDir
}
PROVIDES_devel="
libmatroska${secondaryArchSuffix}_devel = $portVersion
devel:libmatroska$secondaryArchSuffix = 6
devel:libmatroska$secondaryArchSuffix = 6.0.0 compat >= 6
"
REQUIRES_devel="
libmatroska$secondaryArchSuffix == $portVersion base

47
media-libs/libmatroska/patches/libmatroska-1.0.0.patch
View File

@@ -1,47 +0,0 @@
diff -urN libmatroska-1.0.0/make/linux/Makefile libmatroska-1.0.0-haiku/make/linux/Makefile
--- libmatroska-1.0.0/make/linux/Makefile 2010-06-04 08:46:29.017825792 +0000
+++ libmatroska-1.0.0-haiku/make/linux/Makefile 2010-09-27 01:57:28.436994048 +0000
@@ -13,6 +13,10 @@
# BeOS wants the libs and headers in /boot/home/config
ifeq (BeOS,$(shell uname -s))
prefix=/boot/home/config
+endif
+# Haiku wants the libs and headers in /boot/common
+ifeq (Haiku,$(shell uname -s))
+prefix:=$(shell finddir B_COMMON_DIRECTORY)
else
prefix=/usr/local
endif
@@ -153,23 +157,23 @@
endif
install_headers:
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
+ $(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
install_staticlib: $(LIBRARY)
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
install_sharedlib: $(LIBRARY_SO)
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
+ ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
ifneq ($(wildcard .depend),)
include .depend

22
media-libs/libmatroska/patches/libmatroska-1.4.2.patchset Normal file
View File

@@ -0,0 +1,22 @@
From caa315a5ba5ff2053d6e6c429c83017fdc13e567 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 4 Jan 2015 21:54:48 +0000
Subject: gcc2 fix
diff --git a/Makefile.am b/Makefile.am
index f3b881d..063a480 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -I${top_srcdir}
-AM_CXXFLAGS = -Wall -Wextra -Wno-unknown-pragmas -Wshadow $(EBML_CFLAGS)
+AM_CXXFLAGS = -Wall -Wno-unknown-pragmas -Wshadow $(EBML_CFLAGS)
if ENABLE_DEBUG
AM_CPPFLAGS += -DDEBUG
AM_CXXFLAGS += -g
--
1.8.3.4