Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a5a0547eca98ec08624ff50ca23d719eac1d8770)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a5a0547eca98ec08624ff50ca23d719eac1d8770)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a5a0547eca98ec08624ff50ca23d719eac1d8770)
  • Date: Mon, 31 Jul 2006 03:49:30 -0500
GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

kernels/hcfpcimodem/BUILD | 5 -
kernels/hcfpcimodem/DETAILS | 11 --
kernels/hcfpcimodem/HISTORY | 7 +
kernels/hcfpcimodem/INSTALL | 1
kernels/hsfmodem/CONFLICTS | 2
kernels/hsfmodem/DETAILS | 6 -
kernels/hsfmodem/FINAL | 4
kernels/hsfmodem/HISTORY | 6 +
kernels/hsfmodem/INSTALL | 2
kernels/hsfmodem/PRE_REMOVE | 2
libs/stlport/BUILD | 2
libs/stlport/DEPENDS | 1
libs/stlport/DETAILS | 11 +-
libs/stlport/HISTORY | 6 +
mobile/cobex/DETAILS | 4
mobile/cobex/HISTORY | 3
printer/gutenprint/DETAILS | 8 -
printer/gutenprint/HISTORY | 3
video-libs/libmpeg3/BUILD | 29 +++---
video-libs/libmpeg3/DEPENDS | 1
video-libs/libmpeg3/DETAILS | 6 -
video-libs/libmpeg3/HISTORY | 14 +++
video-libs/libmpeg3/Makefile-shared.patch | 100 ----------------------
video-libs/libmpeg3/PRE_BUILD | 5 -
video-libs/libmpeg3/libmpeg3-fixes.patch | 134
------------------------------
video-libs/libmpeg3/mk.diff | 128 ++++++++++++++++++++++++++++
26 files changed, 211 insertions(+), 290 deletions(-)

New commits:
commit 7aa505d0b338a47e0e02d2b8b7a9a6e8d8a3e495
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

libmpeg3 - build fixes

commit 65c2139ff3952f74b8701dca677a2ba1a6d61924
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

gutenprint-5.0.0

commit 12c8d3948d2a8ad535a8bf054ac344abd29017cc
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

libmpeg3-1.7

commit 02cdb20056d3142f50d3f1210b4518b5d4173db8
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

stlport-5.1.0-RC2

commit 7979171158f5e5c7561c845c856481dee4b2ac2f
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

cobex-0.2.10

commit 0d8dca46335ecb93b9dc9df2833f60567bb5812c
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

hcfpcimodem-1.10full

commit 6c61b406078a14e1bead6d7bb00f89b9d721a025
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

hsfmodem-7.47.00.01

diff --git a/kernels/hcfpcimodem/BUILD b/kernels/hcfpcimodem/BUILD
index 1185ace..27ba77d 100755
--- a/kernels/hcfpcimodem/BUILD
+++ b/kernels/hcfpcimodem/BUILD
@@ -1,4 +1 @@
-(
- prepare_install &&
- make install
-) > $C_FIFO 2>&1
\ No newline at end of file
+true
diff --git a/kernels/hcfpcimodem/DETAILS b/kernels/hcfpcimodem/DETAILS
index 803ae1f..ff38909 100755
--- a/kernels/hcfpcimodem/DETAILS
+++ b/kernels/hcfpcimodem/DETAILS
@@ -1,16 +1,13 @@
SPELL=hcfpcimodem
- VERSION=0.99lnxtbeta03042700
+ VERSION=1.10full
+
SOURCE_HASH=sha512:b7891f01a26acaa40d027bf2d1ffc001299f92046029624365201250d4eb8545391dfe976c189ff166397e137676c63e0c9643038a989744d7854ee487844304
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://www.linuxant.com/drivers/hcf/archive/${SPELL}-${VERSION}/${SOURCE}
- WEB_SITE=http://www.mbsi.ca/cnxtlindrv/
+
SOURCE_URL[0]=http://www.linuxant.com/drivers/hcf/full/archive/${SPELL}-${VERSION}/${SOURCE}
+ WEB_SITE=http://www.linuxant.com/drivers/hcf
ENTERED=20020415
- UPDATED=20020510
-
SOURCE_HASH=sha512:eaef38a81d257c0157fc754751fcc603c4faaac8acb2f8d3b839c4e92f65f7b9cf883c120d1bed1a7b5cc0633ad38ccb8ad8f7b21f771c5b73ec68eb6fbf7033
LICENSE[0]=GPL
- MAINTAINER=jkolb AT brandeis.edu
KEYWORDS="kernels"
- BUILD_API=1
SHORT="Modem Driver for HCF Winmodems"
cat << EOF
These modules allow users to use their HCF (mostly Rockwell and Conexant
chips) WinModems in linux. It's currently in Beta. Ater installing run
hcfconfig.
diff --git a/kernels/hcfpcimodem/HISTORY b/kernels/hcfpcimodem/HISTORY
index 43f2bda..1de6aa8 100644
--- a/kernels/hcfpcimodem/HISTORY
+++ b/kernels/hcfpcimodem/HISTORY
@@ -1,3 +1,10 @@
+2006-07-29 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 1.10full
+ remove BUILD_API
+ new WEB_SITE
+ * BUILD: convert to BUILD_API=2
+ * INSTALL: added
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/kernels/hcfpcimodem/INSTALL b/kernels/hcfpcimodem/INSTALL
new file mode 100755
index 0000000..e6fe4f7
--- /dev/null
+++ b/kernels/hcfpcimodem/INSTALL
@@ -0,0 +1 @@
+make install
diff --git a/kernels/hsfmodem/CONFLICTS b/kernels/hsfmodem/CONFLICTS
deleted file mode 100755
index 4dce650..0000000
--- a/kernels/hsfmodem/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts hsflinmodem
-
diff --git a/kernels/hsfmodem/DETAILS b/kernels/hsfmodem/DETAILS
index a19f97c..c2bed71 100755
--- a/kernels/hsfmodem/DETAILS
+++ b/kernels/hsfmodem/DETAILS
@@ -1,15 +1,13 @@
SPELL=hsfmodem
WEB_SITE=http://www.linuxant.com/drivers
- VERSION=6.03.00lnxt04061800
-
SOURCE_HASH=sha512:2a8bd78a604479675fa4803a374e09ca1b584d556529fca039f7dfe53a6ab40c09a847864484a30d5b393883f29718d738f6ec77d712996ba4afef7b74a0b085
- BUILD_API=2
+ VERSION=7.47.00.01
+
SOURCE_HASH=sha512:78ac3fee8f2de6cfac4dac23131b875deaad123c75a8186debea00f849df76e934b6a375208317db606a87c8e921950d4edca071e70d8e1659f34e6b03c2e9bf
VER1=$SPELL-${VERSION}full
URL=$WEB_SITE/hsf/full/archive
SOURCE=$VER1.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$VER1
SOURCE_URL[0]=$URL/$VER1/$SOURCE
ENTERED=20020513
- UPDATED=20030924
LICENSE=$WEB_SITE/license.html
KEYWORDS="kernels"
SHORT="Driver for HSF Winmodems"
diff --git a/kernels/hsfmodem/FINAL b/kernels/hsfmodem/FINAL
index 8962b61..1098866 100755
--- a/kernels/hsfmodem/FINAL
+++ b/kernels/hsfmodem/FINAL
@@ -1,3 +1 @@
-#cd /usr/src/linux
-#echo "\n\n\n" | hsfconfig
-hsfconfig -a
+hsfconfig -a || message hardware not found
diff --git a/kernels/hsfmodem/HISTORY b/kernels/hsfmodem/HISTORY
index be1a2ab..ca6feb5 100755
--- a/kernels/hsfmodem/HISTORY
+++ b/kernels/hsfmodem/HISTORY
@@ -1,3 +1,9 @@
+2006-07-29 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 7.47.00.01
+ * CONFLICTS: delete
+ * INSTALL: specify process type
+ * PRE_REMOVE, FINAL: don't fail if missing hardware
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/kernels/hsfmodem/INSTALL b/kernels/hsfmodem/INSTALL
new file mode 100755
index 0000000..98ebedd
--- /dev/null
+++ b/kernels/hsfmodem/INSTALL
@@ -0,0 +1,2 @@
+make IMPORTED_ARCH=`uname -m` install
+
diff --git a/kernels/hsfmodem/PRE_REMOVE b/kernels/hsfmodem/PRE_REMOVE
index 218fd1e..64a7275 100755
--- a/kernels/hsfmodem/PRE_REMOVE
+++ b/kernels/hsfmodem/PRE_REMOVE
@@ -1,3 +1,3 @@
# remove any modules and devices
-hsfconfig -r
+hsfconfig -r || message hardware not found

diff --git a/libs/stlport/BUILD b/libs/stlport/BUILD
index 3f25bcd..68d90be 100755
--- a/libs/stlport/BUILD
+++ b/libs/stlport/BUILD
@@ -2,7 +2,7 @@ # Set compile to use STLport's headers
PATH_HOLD=${PATH} &&
export PATH=${SOURCE_DIRECTORY}/stlport:${PATH} &&
sedit "s:../g++-v3:/usr/include/c++/`installed_version gcc`:g" \
- stlport/config/stl_gcc.h &&
+ stlport/stl/config/_gcc.h &&

cd build/lib &&
cp gcc.mak Makefile &&
diff --git a/libs/stlport/DEPENDS b/libs/stlport/DEPENDS
index 8bc70c2..c7bf3b8 100755
--- a/libs/stlport/DEPENDS
+++ b/libs/stlport/DEPENDS
@@ -1,3 +1,4 @@
+depends g++ &&
if [ "$STLPORT_LATEST" == "y" ]; then
depends CVS
fi
diff --git a/libs/stlport/DETAILS b/libs/stlport/DETAILS
index bc4387b..3380f2e 100755
--- a/libs/stlport/DETAILS
+++ b/libs/stlport/DETAILS
@@ -5,17 +5,16 @@ if [[ "$STLPORT_LATEST" == y ]]; then

SOURCE_URL[0]=cvs://:pserver:cvs AT cvs.stlport.com:/stlport:STLport:STLPORT_${VERSION//./_}
SOURCE_IGNORE=volatile
else
- VERSION=5.0.2
- SOURCE=STLport-$VERSION.tar.gz
-
SOURCE_HASH=sha512:5ee55c1c8c6c1f9fb2a9a40b43538415312529d055fc7b186824972a4ec8badc6911bf5425164018e19a19a0e7ead30de69bca490308f3b425c94259fe859800
+ VERSION=5.1.0-RC2
+
SOURCE_HASH=sha512:22dffa1efb7fcdb11ef2dcf55e20b19c03501ee4b28b54d01bfe74dd6bb3adceb48e71ac93af86dc09a57fd5dd429553995415dc58e61f11bd5f11417c0aeb0f
+ SOURCE=STLport-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/stlport/$SOURCE
fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/STLport
- WEB_SITE=http://www.stlport.org/
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/STLport-${VERSION//\-RC2/}
+ WEB_SITE=http://stlport.sourceforge.net/
ENTERED=20020302
DISTCC_HOSTS=""
LICENSE[0]=http://www.stlport.org/doc/license.html
- BUILD_API=2
CCACHE=off
KEYWORDS="libs"
SHORT="Full ANSI C++ standard library"
diff --git a/libs/stlport/HISTORY b/libs/stlport/HISTORY
index 308c621..cbc306d 100644
--- a/libs/stlport/HISTORY
+++ b/libs/stlport/HISTORY
@@ -1,4 +1,10 @@
2006-05-19 Treeve Jelbert <treeve AT scarlet.be>
+ * DETAILS: version 5.1.0-RC2
+ new WEB_SITE
+ * BUILD: change sedit, file has moved
+ * DEPENDS: add g++
+
+2006-05-19 Treeve Jelbert <treeve AT scarlet.be>
* DETAILS: version 5.0.2
download from sourceforge
* BUILD: remove a sedit
diff --git a/mobile/cobex/DETAILS b/mobile/cobex/DETAILS
index e41612f..fcbe8d6 100755
--- a/mobile/cobex/DETAILS
+++ b/mobile/cobex/DETAILS
@@ -1,6 +1,6 @@
SPELL=cobex
- VERSION=0.2.9
-
SOURCE_HASH=sha512:c0ff823d44798d98daba51ba0cbab82e045baa952b5b5246aacb25cc95b874e22279658a7a9029ef2d5b72806b4b7c61dc52940c2bfc382e9f75b2466e52d348
+ VERSION=0.2.10
+
SOURCE_HASH=sha512:ec95afe0f5f410b4469021f4d932c8ebfadaf0de3510bd24b73f23482e1f762dd51c8f6cf4538c1b32e781f05ebac81877e622157e05d1f8a96f95a6cb748f57
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/mobile/cobex/HISTORY b/mobile/cobex/HISTORY
index 9087109..7ea65ff 100644
--- a/mobile/cobex/HISTORY
+++ b/mobile/cobex/HISTORY
@@ -1,3 +1,6 @@
+2006-07-29 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 0.2.10
+
2006-07-06 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 0.2.9
add keywords
diff --git a/printer/gutenprint/DETAILS b/printer/gutenprint/DETAILS
index 434583d..99661c7 100755
--- a/printer/gutenprint/DETAILS
+++ b/printer/gutenprint/DETAILS
@@ -1,8 +1,8 @@
SPELL=gutenprint
- VERSION=20060716
-
SOURCE_HASH=sha512:6725ddd1947cc3222673ee36b1abd26234d99e92a2093d511edd2a9d3d6bdd8f00c41c3ba88a6ce40fa2c1b81c80cd4649f93d5583f3256240b621a723bbc2f0
- SOURCE=${SPELL}${VERSION}.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}${VERSION}
+ VERSION=5.0.0
+
SOURCE_HASH=sha512:67f98e5ea7f37618f5ca55d393dbe585f182585105d4e0dfa55970d0354dfa2c1a43ee3cb5b7ba55ec4c71c960d97c35da2da8caabef374aa7cba03e57712cfd
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/gimp-print/${SOURCE}
WEB_SITE=http://gutenprint.sourceforge.net
LICENSE[0]=GPL
diff --git a/printer/gutenprint/HISTORY b/printer/gutenprint/HISTORY
index 09857db..ddc6535 100644
--- a/printer/gutenprint/HISTORY
+++ b/printer/gutenprint/HISTORY
@@ -1,3 +1,6 @@
+2006-07-31 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 5.0.0
+
2006-07-27 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 20060716

diff --git a/video-libs/libmpeg3/BUILD b/video-libs/libmpeg3/BUILD
index 44686e5..916568f 100755
--- a/video-libs/libmpeg3/BUILD
+++ b/video-libs/libmpeg3/BUILD
@@ -1,18 +1,17 @@
-invoke_gcc
-
# fails to compile with -DPIC -fPIC except on systems that need -fPIC
-if [[ "$SMGL_COMPAT_ARCHS[1]" != "x86_64" ]]
-then
- CFLAGS=${CFLAGS/-mmmx/}
-fi &&
+#if [[ "$SMGL_COMPAT_ARCHS[1]" != "x86_64" ]]
+#then
+## CFLAGS=${CFLAGS/-mmmx/}
+#fi &&
disable_pic &&

-if ! echo $CFLAGS | grep -q -- "-O."; then
- CFLAGS="$CFLAGS -O2"
-fi &&
-if echo $CFLAGS | grep -q -- "-mmmx"; then
- USE_MMX=1
-else
- USE_MMX=0
-fi &&
-make USE_MMX=$USE_MMX
+#if ! echo $CFLAGS | grep -q -- "-O."; then
+# CFLAGS="$CFLAGS -O2"
+#fi &&
+#if echo $CFLAGS | grep -q -- "-mmmx"; then
+# USE_MMX=1
+#else
+# USE_MMX=0
+#fi &&
+#make USE_MMX=$USE_MMX
+make
diff --git a/video-libs/libmpeg3/DEPENDS b/video-libs/libmpeg3/DEPENDS
index 858cafb..075735e 100755
--- a/video-libs/libmpeg3/DEPENDS
+++ b/video-libs/libmpeg3/DEPENDS
@@ -1,3 +1,2 @@
-depends gcc34 &&
depends a52dec &&
depends nasm
diff --git a/video-libs/libmpeg3/DETAILS b/video-libs/libmpeg3/DETAILS
index 6f1e2c5..bb47163 100755
--- a/video-libs/libmpeg3/DETAILS
+++ b/video-libs/libmpeg3/DETAILS
@@ -1,14 +1,12 @@
SPELL=libmpeg3
- VERSION=1.5.4
+ VERSION=1.7
+
SOURCE_HASH=sha512:acc4c816b24daba91d5bf4b2c0dcd8ba32452ca54e5fea19c1df0e547e0a58e32b36e226091e9cb57d1ac1a851ad5327d2b05426e61e36bf1893977dff970343
SOURCE=$SPELL-$VERSION-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/heroines/$SOURCE
WEB_SITE=http://heroinewarrior.com
-
SOURCE_HASH=sha512:966bec7d33f85d2f0b89fbe1f6dfc3d712306e6ca95e9e8d56690e5033a765417f4cbccc61202a26a720bfc3ce8f7c1778cd6bed1837be974a0c51ba824d441a
LICENSE[0]=LGPL
ENTERED=20030425
- UPDATED=20030425
- GCC_VERSION=3.4
KEYWORDS="streaming video libs"
SHORT="Libmpeg3 supports advanced editing and manipulation of
MPEG streams"
cat << EOF
diff --git a/video-libs/libmpeg3/HISTORY b/video-libs/libmpeg3/HISTORY
index f11a63a..e2605de 100644
--- a/video-libs/libmpeg3/HISTORY
+++ b/video-libs/libmpeg3/HISTORY
@@ -1,3 +1,17 @@
+2006-07-31 Treeve Jelbert <treeve AT pi.be>
+ * mk.diff: added, based on previous Makefile-shared.patch
+ also fixes gcc warnings about memcopy
+ * PRE_BUILD: apply mk.diff
+ * BUILD: disable MMX logic, seems fine without it
+
+2006-07-30 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 1.7
+ remove GCC_VERSION
+ * PRE_BUILD: disable libmpeg3-fixes.patch patch
+ * *.patch: remove
+ * DEPENDS: delete gcc34 (builds with gcc-4.1.1)
+ * BUILD: remove invoke_gcc ( done by default_prebuild)
+
2006-05-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD: only apply the previous fix if make is at version 3.81,
bug #12071
diff --git a/video-libs/libmpeg3/Makefile-shared.patch
b/video-libs/libmpeg3/Makefile-shared.patch
deleted file mode 100644
index 5f7d1c1..0000000
--- a/video-libs/libmpeg3/Makefile-shared.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- Makefile-old 2004-02-09 15:18:25.000000000 +0100
-+++ Makefile 2004-02-09 15:20:16.000000000 +0100
-@@ -1,6 +1,5 @@
- CC = gcc
- NASM = nasm
--USE_MMX = 0
- USE_CSS = 1
- A52DIR := $(shell expr a52dec* )
-
-@@ -16,6 +15,11 @@
- OBJDIR := $(shell uname --machine)
-
-
-+ifneq ($(OBJDIR), alpha)
-+ ifneq ($(OBJDIR), x86_64)
-+ CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE
-+ endif
-+endif
-
-
- ifeq ($(OBJDIR), alpha)
-@@ -25,14 +29,6 @@
- endif
- endif
-
--ifeq ($(OBJDIR), i686)
-- USE_MMX = 1
-- ifneq ($(HAVE_CFLAGS), y)
-- CFLAGS := -O2 -fomit-frame-pointer -falign-loops=2 -falign-jumps=2
-falign-functions=2 -I/usr/local/include
-- endif
-- CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
--endif
--
- ifeq ($(OBJDIR), x86_64)
- ifneq ($(HAVE_CFLAGS), y)
- CFLAGS := -O2 -fomit-frame-pointer -I/usr/local/include
-@@ -61,6 +57,7 @@
-
- CFLAGS += \
- -I. \
-+ -I/usr/include/a52dec \
- -I$(A52DIR)/include \
- -I$(A52DIR)/liba52
-
-@@ -127,18 +124,13 @@
- $(OBJDIR)/audio \
- $(OBJDIR)/video
-
--include Makefile.a52
--
--DIRS += $(A52DIRS)
--
--
--OUTPUT = $(OBJDIR)/libmpeg3.a
-+OUTPUT = $(OBJDIR)/libmpeg3.so
- UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3toc $(OBJDIR)/mpeg3cat
-
- #$(OBJDIR)/mpeg3split
-
-
--LIBS = -lm -lpthread
-+LIBS = -lm -lpthread -L$(shell uname --machine)
-
- $(shell if ! test -d $(OBJDIR) \; then mkdir -p $(OBJDIR) \; fi )
-
-@@ -151,18 +143,18 @@
-
-
- $(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS)
-- ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
-+ ld -shared -o $(OUTPUT) `cat $(OBJDIR)/objs` $(LIBS) -la52
-
-
-
- $(OBJDIR)/mpeg3dump: $(OUTPUT) mpeg3dump.c
-- $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3dump mpeg3dump.c
$(OUTPUT) $(LIBS)
-+ $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3dump mpeg3dump.c
-lmpeg3 $(LIBS)
-
- $(OBJDIR)/mpeg3toc: $(OUTPUT) mpeg3toc.c
-- $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3toc mpeg3toc.c
$(OUTPUT) $(LIBS)
-+ $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3toc mpeg3toc.c
-lmpeg3 $(LIBS)
-
- $(OBJDIR)/mpeg3cat: $(OUTPUT) mpeg3cat.c
-- $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3cat mpeg3cat.c
$(OUTPUT) $(LIBS)
-+ $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3cat mpeg3cat.c
-lmpeg3 $(LIBS)
-
- #$(OBJDIR)/mpeg3split: $(OUTPUT)
- # $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3split mpeg3split.c
$(OUTPUT) $(LIBS)
-@@ -179,7 +171,11 @@
- -ldl
-
- install:
-+ mkdir -p /usr/include/libmpeg3
-+ cp libmpeg3.h mpeg3private.h mpeg3protos.h /usr/include/libmpeg3
- cp $(UTILS) /usr/bin
-+ cp $(OUTPUT) /usr/lib
-+ ldconfig
-
- clean:
- rm -rf $(OBJDIR)
diff --git a/video-libs/libmpeg3/PRE_BUILD b/video-libs/libmpeg3/PRE_BUILD
index 621f421..8cdf3d4 100755
--- a/video-libs/libmpeg3/PRE_BUILD
+++ b/video-libs/libmpeg3/PRE_BUILD
@@ -1,7 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/Makefile-shared.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/libmpeg3-fixes.patch &&
+# force building of shared libraries
+patch -p1 < $SCRIPT_DIRECTORY/mk.diff &&
+#patch -p0 < $SCRIPT_DIRECTORY/libmpeg3-fixes.patch &&
if make -v | grep -q 3.81; then
# fix Makefile to work with make 3.81
sedit 's/\\;/;/g' Makefile
diff --git a/video-libs/libmpeg3/libmpeg3-fixes.patch
b/video-libs/libmpeg3/libmpeg3-fixes.patch
deleted file mode 100644
index 9fa2d0f..0000000
--- a/video-libs/libmpeg3/libmpeg3-fixes.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- video/slice.c.orig 2004-08-31 19:26:59.833231807 +0200
-+++ video/slice.c 2004-08-31 19:27:10.771837622 +0200
-@@ -6,7 +6,7 @@
-
- #define CLIP(x) ((x) >= 0 ? ((x) < 255 ? (x) : 255) : 0)
-
--static unsigned long long MMX_128 = 0x80008000800080LL;
-+unsigned long long MMX_128 = 0x80008000800080LL;
-
- int mpeg3_new_slice_buffer(mpeg3_slice_buffer_t *slice_buffer)
- {
---- video/output.c.orig 2004-08-31 19:35:30.407156377 +0200
-+++ video/output.c 2004-08-31 19:39:46.689491796 +0200
-@@ -4,25 +4,25 @@
-
- #define CLIP(x) ((x) >= 0 ? ((x) < 255 ? (x) : 255) : 0)
-
--static long long mpeg3_MMX_0 = 0L;
--static unsigned long mpeg3_MMX_10w[] = {0x00100010, 0x00100010};
/*dd 00010 0010h, 000100010h */
--static unsigned long mpeg3_MMX_80w[] = {0x00800080, 0x00800080};
/*dd 00080 0080h, 000800080h */
-+long long mpeg3_MMX_0 = 0L;
-+unsigned long mpeg3_MMX_10w[] = {0x00100010, 0x00100010};
/*dd 00010 0010h, 000100010h */
-+unsigned long mpeg3_MMX_80w[] = {0x00800080, 0x00800080};
/*dd 00080 0080h, 000800080h */
-
--static unsigned long mpeg3_MMX_00FFw[] = {0x00ff00ff, 0x00ff00ff};
/*dd 000FF 00FFh, 000FF00FFh */
-+unsigned long mpeg3_MMX_00FFw[] = {0x00ff00ff, 0x00ff00ff};
/*dd 000FF 00FFh, 000FF00FFh */
-
--static unsigned short mpeg3_MMX_Ublucoeff[] = {0x81, 0x81, 0x81, 0x81};
/*dd 00081 0081h, 000810081h */
--static unsigned short mpeg3_MMX_Vredcoeff[] = {0x66, 0x66, 0x66, 0x66};
/*dd 00066 0066h, 000660066h */
-+unsigned short mpeg3_MMX_Ublucoeff[] = {0x81, 0x81, 0x81, 0x81};
/*dd 00081 0081h, 000810081h */
-+unsigned short mpeg3_MMX_Vredcoeff[] = {0x66, 0x66, 0x66, 0x66};
/*dd 00066 0066h, 000660066h */
-
--static unsigned short mpeg3_MMX_Ugrncoeff[] = {0xffe8, 0xffe8, 0xffe8,
0xffe8}; /*dd 0FFE7 FFE7h, 0FFE7FFE7h */
--static unsigned short mpeg3_MMX_Vgrncoeff[] = {0xffcd, 0xffcd, 0xffcd,
0xffcd}; /*dd 0FFCC FFCCh, 0FFCCFFCCh */
-+unsigned short mpeg3_MMX_Ugrncoeff[] = {0xffe8, 0xffe8, 0xffe8, 0xffe8};
/*dd 0FFE7 FFE7h, 0FFE7FFE7h */
-+unsigned short mpeg3_MMX_Vgrncoeff[] = {0xffcd, 0xffcd, 0xffcd, 0xffcd};
/*dd 0FFCC FFCCh, 0FFCCFFCCh */
-
--static unsigned short mpeg3_MMX_Ycoeff[] = {0x4a, 0x4a, 0x4a, 0x4a};
/*dd 0004A 004Ah, 0004A004Ah */
-+unsigned short mpeg3_MMX_Ycoeff[] = {0x4a, 0x4a, 0x4a, 0x4a};
/*dd 0004A 004Ah, 0004A004Ah */
-
--static unsigned short mpeg3_MMX_redmask[] = {0xf800, 0xf800, 0xf800,
0xf800}; /*dd 07c00 7c00h, 07c007c00h */
-+unsigned short mpeg3_MMX_redmask[] = {0xf800, 0xf800, 0xf800, 0xf800};
/*dd 07c00 7c00h, 07c007c00h */
-
--static unsigned short mpeg3_MMX_grnmask[] = {0x7e0, 0x7e0, 0x7e0,
0x7e0}; /*dd 003e0 03e0h, 003e003e0h */
-+unsigned short mpeg3_MMX_grnmask[] = {0x7e0, 0x7e0, 0x7e0, 0x7e0};
/*dd 003e0 03e0h, 003e003e0h */
-
--static unsigned char mpeg3_601_to_rgb[256];
-+unsigned char mpeg3_601_to_rgb[256];
-
- /* Algorithm */
- /* r = (int)(*y + 1.371 * (*cr - 128)); */
-@@ -207,12 +207,12 @@
- );
- }
-
--static unsigned long long mpeg3_MMX_U_80 = 0x0000008000800000LL;
--static unsigned long long mpeg3_MMX_V_80 = 0x0000000000800080LL;
--static long long mpeg3_MMX_U_COEF = 0x00000058ffd30000LL;
--static long long mpeg3_MMX_V_COEF = 0x00000000ffea006fLL;
--static long long mpeg3_MMX_601_Y_COEF = 0x0000004800480048LL;
--static long long mpeg3_MMX_601_Y_DIFF = 0x0000000000000010LL;
-+unsigned long long mpeg3_MMX_U_80 = 0x0000008000800000LL;
-+unsigned long long mpeg3_MMX_V_80 = 0x0000000000800080LL;
-+long long mpeg3_MMX_U_COEF = 0x00000058ffd30000LL;
-+long long mpeg3_MMX_V_COEF = 0x00000000ffea006fLL;
-+long long mpeg3_MMX_601_Y_COEF = 0x0000004800480048LL;
-+long long mpeg3_MMX_601_Y_DIFF = 0x0000000000000010LL;
-
- inline void mpeg3_bgra32_mmx(unsigned long y,
- unsigned long u,
-@@ -297,10 +297,10 @@
- : "r" (&y), "r" (&u), "r" (&v), "r" (output));
- }
-
--static unsigned long long mpeg3_MMX_U_80_RGB = 0x0000000000800080LL;
--static unsigned long long mpeg3_MMX_V_80_RGB = 0x0000008000800000LL;
--static long long mpeg3_MMX_U_COEF_RGB = 0x00000000ffd30058LL;
--static long long mpeg3_MMX_V_COEF_RGB = 0x0000006fffea0000LL;
-+unsigned long long mpeg3_MMX_U_80_RGB = 0x0000000000800080LL;
-+unsigned long long mpeg3_MMX_V_80_RGB = 0x0000008000800000LL;
-+long long mpeg3_MMX_U_COEF_RGB = 0x00000000ffd30058LL;
-+long long mpeg3_MMX_V_COEF_RGB = 0x0000006fffea0000LL;
-
- inline void mpeg3_rgba32_mmx(unsigned long y,
- unsigned long u,
---- video/reconstruct.c.orig 2004-08-31 19:41:49.910786570 +0200
-+++ video/reconstruct.c 2004-08-31 19:42:23.557498113 +0200
-@@ -5,7 +5,7 @@
- #ifdef HAVE_MMX
-
- #ifdef HAVE_3Dnow
--static inline void recva_mmx(unsigned char *s, unsigned char *d, int lx,
int lx2, int h)
-+inline void recva_mmx(unsigned char *s, unsigned char *d, int lx, int lx2,
int h)
- {
- __asm__(
- ".align 8\n"
-@@ -34,7 +34,7 @@
- );
- }
-
--static inline void recvac_mmx(unsigned char *s, unsigned char *d, int
lx,int lx2, int h)
-+inline void recvac_mmx(unsigned char *s, unsigned char *d, int lx,int lx2,
int h)
- {
- __asm__(
- ".align 8\n"
-@@ -54,7 +54,7 @@
- );
- }
-
--static inline void rech_mmx(unsigned char *s, unsigned char *d, int lx2,
int h)
-+inline void rech_mmx(unsigned char *s, unsigned char *d, int lx2, int h)
- {
- __asm__ (
- ".align 8\n"
-@@ -77,7 +77,7 @@
- );
- }
-
--static inline void rechc_mmx(unsigned char *s, unsigned char *d, int lx2,
int h)
-+inline void rechc_mmx(unsigned char *s, unsigned char *d, int lx2, int h)
- {
- __asm__ (
- ".align 8\n"
-@@ -271,8 +271,8 @@
- }
-
- #else // HAVE_3DNOW
-- static long long ADD_1 = 0x0101010101010101LL;
-- static long long MASK_AND = 0x7f7f7f7f7f7f7f7fLL;
-+ long long ADD_1 = 0x0101010101010101LL;
-+ long long MASK_AND = 0x7f7f7f7f7f7f7f7fLL;
- #endif
-
- static inline void rec_mmx(unsigned char *s, unsigned char *d, int lx2, int
h)
diff --git a/video-libs/libmpeg3/mk.diff b/video-libs/libmpeg3/mk.diff
new file mode 100644
index 0000000..715d546
--- /dev/null
+++ b/video-libs/libmpeg3/mk.diff
@@ -0,0 +1,128 @@
+diff -uNr libmpeg3-1.7/audio/mpeg3audio.c libmpeg3-1.7.cp/audio/mpeg3audio.c
+--- libmpeg3-1.7/audio/mpeg3audio.c 2006-02-19 12:43:27.000000000 +0100
++++ libmpeg3-1.7.cp/audio/mpeg3audio.c 2006-07-31 09:45:45.000000000 +0200
+@@ -3,6 +3,7 @@
+
+ #include <math.h>
+ #include <stdlib.h>
++#include <memory.h>
+
+
+
+diff -uNr libmpeg3-1.7/Makefile libmpeg3-1.7.cp/Makefile
+--- libmpeg3-1.7/Makefile 2006-02-15 06:09:31.000000000 +0100
++++ libmpeg3-1.7.cp/Makefile 2006-07-31 10:44:22.000000000 +0200
+@@ -2,7 +2,6 @@
+ NASM = nasm
+ USE_MMX = 0
+ USE_CSS = 1
+-A52DIR := $(shell expr a52dec* )
+
+
+ ifeq ("$(PREFIX)", "")
+@@ -59,24 +58,7 @@
+
+
+
+-
+-
+-
+-CFLAGS += \
+- -I. \
+- -I$(A52DIR)/include \
+- -I$(A52DIR)/liba52
+-
+-
+-
+-CFLAGS += -g
+-
+-
+-
+-
+-
+-
+-
++CFLAGS += -I. -I/usr/include/a52dec
+
+
+
+@@ -136,23 +118,20 @@
+ $(OBJDIR)/audio \
+ $(OBJDIR)/video
+
+-include Makefile.a52
+-
+-DIRS += $(A52DIRS)
+
+-
+-OUTPUT = $(OBJDIR)/libmpeg3.a
++OUTPUT = libmpeg3.so
+ UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3peek $(OBJDIR)/mpeg3toc
$(OBJDIR)/mpeg3cat
+
+ #$(OBJDIR)/mpeg3split
+
+
+-LIBS = -lm -lpthread
++#LIBS = -lm -lpthread -L$(shell uname --machine) -la52 -lmpeg3
++LIBS = -lm -lpthread -la52 -lmpeg3
+
+ $(shell if ! test -d $(OBJDIR) \; then mkdir -p $(OBJDIR) \; fi )
+
+ $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
+-$(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags)
++#$(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags)
+ $(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs)
+ $(shell mkdir -p $(DIRS) )
+
+@@ -160,7 +139,7 @@
+
+
+ $(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS)
+- ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
++ ld -shared -o $(OUTPUT) `cat $(OBJDIR)/objs` $(LIBS)
+
+
+
+@@ -191,10 +170,11 @@
+ -ldl
+
+ install:
++ mkdir -p /usr/include/libmpeg3
+ cp $(UTILS) $(PREFIX)/bin
+-# cp $(OUTPUT) $(PREFIX)/lib
+-# cp libmpeg3.h mpeg3private.h $(PREFIX)/include
+-
++ cp $(OUTPUT) $(PREFIX)/lib
++ cp libmpeg3.h mpeg3private.h mpeg3protos.h $(PREFIX)/include/libmpeg3
++
+ clean:
+ rm -rf $(OBJDIR)
+
+@@ -211,8 +191,8 @@
+ $(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.S) -o $*.o
+ $(NASMOBJS):
+ $(NASM) -f elf $(subst $(OBJDIR)/,, $*.s) -o $*.o
+-$(A52OBJS):
+- $(CC) -c `cat $(OBJDIR)/a52_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
++#$(A52OBJS):
++# $(CC) -c `cat $(OBJDIR)/a52_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
+
+ $(OBJDIR)/libmpeg3.o: libmpeg3.c
+ $(OBJDIR)/mpeg3atrack.o: mpeg3atrack.c
+@@ -259,4 +239,4 @@
+
+
+
+-include depend.a52
++#include depend.a52
+diff -uNr libmpeg3-1.7/video/subtitle.c libmpeg3-1.7.cp/video/subtitle.c
+--- libmpeg3-1.7/video/subtitle.c 2006-02-27 05:14:00.000000000 +0100
++++ libmpeg3-1.7.cp/video/subtitle.c 2006-07-31 09:44:48.000000000 +0200
+@@ -2,6 +2,7 @@
+ #include "mpeg3protos.h"
+
+ #include <stdlib.h>
++#include <memory.h>
+
+ static unsigned char get_nibble(unsigned char **ptr, int *nibble)
+ {


  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a5a0547eca98ec08624ff50ca23d719eac1d8770), Treeve Jelbert, 07/31/2006

Archive powered by MHonArc 2.6.24.

Top of Page