Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4c16e5e0cb13ab9da20f006b64bac90426a02087)
  • Date: Sat, 11 Oct 2008 13:59:07 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kernels/module-init-tools/DETAILS | 2
kernels/module-init-tools/HISTORY | 3
video-libs/libmpeg3/DETAILS | 4 -
video-libs/libmpeg3/HISTORY | 4 +
video-libs/libmpeg3/PRE_BUILD | 9 --
video-libs/libmpeg3/mk.diff | 128
--------------------------------------
6 files changed, 10 insertions(+), 140 deletions(-)

New commits:
commit 43de6b8f750682a04420a54e0c4ccc7c38cc127c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

"module-init-tools-3.4.1"

commit 695bb72989be60e0f0c67c248144cdbb037757af
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

"libmpeg3-1.8"

diff --git a/kernels/module-init-tools/DETAILS
b/kernels/module-init-tools/DETAILS
index 8102a2f..b45257e 100755
--- a/kernels/module-init-tools/DETAILS
+++ b/kernels/module-init-tools/DETAILS
@@ -15,7 +15,7 @@ fi
# new module-init-tools data

SPELL=module-init-tools
- VERSION=3.4
+ VERSION=3.4.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.kerneltools.org/
diff --git a/kernels/module-init-tools/HISTORY
b/kernels/module-init-tools/HISTORY
index 9f58681..62059f2 100644
--- a/kernels/module-init-tools/HISTORY
+++ b/kernels/module-init-tools/HISTORY
@@ -1,3 +1,6 @@
+2008-10-11 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 3.4.1
+
2008-08-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: fixed SOURCE_URLs

diff --git a/video-libs/libmpeg3/DETAILS b/video-libs/libmpeg3/DETAILS
index bb47163..37a261c 100755
--- a/video-libs/libmpeg3/DETAILS
+++ b/video-libs/libmpeg3/DETAILS
@@ -1,6 +1,6 @@
SPELL=libmpeg3
- VERSION=1.7
-
SOURCE_HASH=sha512:acc4c816b24daba91d5bf4b2c0dcd8ba32452ca54e5fea19c1df0e547e0a58e32b36e226091e9cb57d1ac1a851ad5327d2b05426e61e36bf1893977dff970343
+ VERSION=1.8
+
SOURCE_HASH=sha512:e381f07d46d47d391c6db420791a065e3572e17ca63966eb52712560867866683505693f73b25869059319eec66fd1c2f923dbef1fdca5ef9efbe598e217d60e
SOURCE=$SPELL-$VERSION-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/heroines/$SOURCE
diff --git a/video-libs/libmpeg3/HISTORY b/video-libs/libmpeg3/HISTORY
index aad1a50..3b70253 100644
--- a/video-libs/libmpeg3/HISTORY
+++ b/video-libs/libmpeg3/HISTORY
@@ -1,3 +1,7 @@
+2008-10-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8
+ * mk.diff, PRE_BUILD: deleted
+
2007-01-07 Treeve Jelbert <treeve AT sourcemage.org>
* mk.diff: remove -lmpeg3 from LIBS
fixes bug #13352
diff --git a/video-libs/libmpeg3/PRE_BUILD b/video-libs/libmpeg3/PRE_BUILD
deleted file mode 100755
index 8cdf3d4..0000000
--- a/video-libs/libmpeg3/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# 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
-fi
diff --git a/video-libs/libmpeg3/mk.diff b/video-libs/libmpeg3/mk.diff
deleted file mode 100644
index fb52472..0000000
--- a/video-libs/libmpeg3/mk.diff
+++ /dev/null
@@ -1,128 +0,0 @@
-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
-
- $(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 (4c16e5e0cb13ab9da20f006b64bac90426a02087), Treeve Jelbert, 10/11/2008

Archive powered by MHonArc 2.6.24.

Top of Page