From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../files/subtitleripper-0.3.4-glibc210.patch | 21 ++++++++++++++++ .../files/subtitleripper-0.3.4-libpng.patch | 25 +++++++++++++++++++ .../files/subtitleripper-0.3.4-linkingorder.patch | 28 ++++++++++++++++++++++ .../subtitleripper-0.3.4-respect-ldflags.patch | 28 ++++++++++++++++++++++ 4 files changed, 102 insertions(+) create mode 100644 media-video/subtitleripper/files/subtitleripper-0.3.4-glibc210.patch create mode 100644 media-video/subtitleripper/files/subtitleripper-0.3.4-libpng.patch create mode 100644 media-video/subtitleripper/files/subtitleripper-0.3.4-linkingorder.patch create mode 100644 media-video/subtitleripper/files/subtitleripper-0.3.4-respect-ldflags.patch (limited to 'media-video/subtitleripper/files') diff --git a/media-video/subtitleripper/files/subtitleripper-0.3.4-glibc210.patch b/media-video/subtitleripper/files/subtitleripper-0.3.4-glibc210.patch new file mode 100644 index 000000000000..8dc2b24f9f6a --- /dev/null +++ b/media-video/subtitleripper/files/subtitleripper-0.3.4-glibc210.patch @@ -0,0 +1,21 @@ +diff -Naurp subtitleripper-orig/vobsub.c subtitleripper/vobsub.c +--- subtitleripper-orig/vobsub.c 2003-12-08 03:28:02.000000000 -0600 ++++ subtitleripper/vobsub.c 2009-05-30 19:09:13.266973499 -0600 +@@ -56,7 +56,7 @@ extern ssize_t getline(char **, size_t * + /* FIXME This should go into a general purpose library or even a + separate file. */ + static ssize_t +-getline (char **lineptr, size_t *n, FILE *stream) ++get_line (char **lineptr, size_t *n, FILE *stream) + { + size_t res = 0; + int c; +@@ -753,7 +753,7 @@ vobsub_parse_one_line(vobsub_t *vob, FIL + do { + size_t line_reserve = 0; + char *line = NULL; +- line_size = getline(&line, &line_reserve, fd); ++ line_size = get_line(&line, &line_reserve, fd); + if (line_size < 0) { + if (line) + free(line); diff --git a/media-video/subtitleripper/files/subtitleripper-0.3.4-libpng.patch b/media-video/subtitleripper/files/subtitleripper-0.3.4-libpng.patch new file mode 100644 index 000000000000..e9869b3bd5dd --- /dev/null +++ b/media-video/subtitleripper/files/subtitleripper-0.3.4-libpng.patch @@ -0,0 +1,25 @@ +diff -NrU5 subtitleripper.orig/spudec.c subtitleripper/spudec.c +--- subtitleripper.orig/spudec.c 2009-05-20 03:06:23.000000000 -0600 ++++ subtitleripper/spudec.c 2009-05-20 03:07:47.000000000 -0600 +@@ -34,17 +34,18 @@ + + #ifdef _HAVE_ZLIB_ + #include + #endif + ++#ifdef _HAVE_PNG_ ++#include ++#endif ++ + #ifdef _HAVE_LIB_PPM_ + #include + #endif + +-#ifdef _HAVE_PNG_ +-#include "png.h" +-#endif + + static void spudec_handle_rest(spudec_handle_t *this); + + // read a big endian 16 bit value + static inline unsigned int get_be16(const unsigned char *p) diff --git a/media-video/subtitleripper/files/subtitleripper-0.3.4-linkingorder.patch b/media-video/subtitleripper/files/subtitleripper-0.3.4-linkingorder.patch new file mode 100644 index 000000000000..7efe223460fc --- /dev/null +++ b/media-video/subtitleripper/files/subtitleripper-0.3.4-linkingorder.patch @@ -0,0 +1,28 @@ +Index: subtitleripper/Makefile +=================================================================== +--- subtitleripper.orig/Makefile ++++ subtitleripper/Makefile +@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud + # Target + subtitle2pgm: subtitle2pgm.o spudec.o + @echo "Linking $@" +- @$(CC) $(LIBS) $^ -o $@ ++ @$(CC) $^ -o $@ $(LIBS) + + subtitle2vobsub: subtitle2vobsub.o vobsub.o + @echo "Linking $@" +- @$(CC) $(LIBS) $^ -o $@ ++ @$(CC) $^ -o $@ $(LIBS) + + srttool: srttool.o + @echo "Linking $@" +- @$(CC) $(LIBS) -g $^ -o $@ ++ @$(CC) -g $^ -o $@ $(LIBS) + + vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o + @echo "Linking $@" +- @$(CC) $(LIBS) -g $^ -o $@ ++ @$(CC) -g $^ -o $@ $(LIBS) + + .PHONY: clean dist rpm + clean: diff --git a/media-video/subtitleripper/files/subtitleripper-0.3.4-respect-ldflags.patch b/media-video/subtitleripper/files/subtitleripper-0.3.4-respect-ldflags.patch new file mode 100644 index 000000000000..2af11d257929 --- /dev/null +++ b/media-video/subtitleripper/files/subtitleripper-0.3.4-respect-ldflags.patch @@ -0,0 +1,28 @@ +Index: subtitleripper/Makefile +=================================================================== +--- subtitleripper.orig/Makefile ++++ subtitleripper/Makefile +@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud + # Target + subtitle2pgm: subtitle2pgm.o spudec.o + @echo "Linking $@" +- @$(CC) $^ -o $@ $(LIBS) ++ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + subtitle2vobsub: subtitle2vobsub.o vobsub.o + @echo "Linking $@" +- @$(CC) $^ -o $@ $(LIBS) ++ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + srttool: srttool.o + @echo "Linking $@" +- @$(CC) -g $^ -o $@ $(LIBS) ++ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o + @echo "Linking $@" +- @$(CC) -g $^ -o $@ $(LIBS) ++ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + .PHONY: clean dist rpm + clean: -- cgit v1.2.3-65-gdbad