Attachment #486134 for bug #525902

View | Details | Raw Unified | Return to bug 525902
Collapse All | Expand All

Lines 4-10 Link Here

(-)./src/lib_ccx/ccx_sub_entry_message.pb-c.h.orig (-1 / +1 lines)
4	#ifndef PROTOBUF_C_ccx_5fsub_5fentry_5fmessage_2eproto__INCLUDED	4	#ifndef PROTOBUF_C_ccx_5fsub_5fentry_5fmessage_2eproto__INCLUDED
5	#define PROTOBUF_C_ccx_5fsub_5fentry_5fmessage_2eproto__INCLUDED	5	#define PROTOBUF_C_ccx_5fsub_5fentry_5fmessage_2eproto__INCLUDED
6		6
7	#include "protobuf-c.h"	7	#include "protobuf-c/protobuf-c.h"
8	#include "lib_ccx.h"	8	#include "lib_ccx.h"
9		9
10	#ifdef ENABLE_SHARING	10	#ifdef ENABLE_SHARING

Lines 1-7 Link Here

(-)./src/lib_ccx/ccx_decoders_vbi.h.orig (-1 / +1 lines)
1	#ifndef CCX_DECODER_VBI	1	#ifndef CCX_DECODER_VBI
2	#define CCX_DECODER_VBI	2	#define CCX_DECODER_VBI
3		3
4	#include <zvbi_decoder.h>	4	#include <libzvbi.h>
5	#define VBI_DEBUG	5	#define VBI_DEBUG
6		6
7	#include "ccx_decoders_structs.h"	7	#include "ccx_decoders_structs.h"




#!/bin/bash
BLD_FLAGS="-std=gnu99 -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DENABLE_OCR"
BLD_INCLUDE="-I../src -I /usr/include/leptonica/ -I /usr/include/tesseract/ -I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/lib_hash"
SRC_LIBPNG="$(find ../src/libpng/ -name '*.c')"
SRC_ZLIB="$(find ../src/zlib/ -name '*.c')"
SRC_ZVBI="$(find ../src/zvbi/ -name '*.c')"
SRC_CCX="$(find ../src/lib_ccx/ -name '*.c')"
SRC_GPAC="$(find ../src/gpacmp4/ -name '*.c')"
SRC_HASH="$(find ../src/lib_hash/ -name '*.c')"
BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_GPAC $SRC_HASH"
BLD_SOURCES="../src/ccextractor.c"
BLD_LINKER="-lm -zmuldefs -l tesseract -l lept -lz -lpng16 -lprotobuf-c -lzvbi -lpthread -lutf8proc"
BLD_LINKER="-lm -zmuldefs -l tesseract -l lept"

./pre-build.sh

out=$(gcc $BLD_FLAGS $BLD_INCLUDE -o ccextractor $BLD_SOURCES $BLD_LINKER)
res=$?
if [[ $out == *"gcc: command not found"* ]]
then





CC = gcc
SYS := $(shell gcc -dumpmachine)
CFLAGS = -std=gnu99 -s
INCLUDE = -I../src/gpacmp4/ -I../src/lib_hash -I../src/lib_ccx
INCLUDE += -I../src/zvbi -I../src/utf8proc
ALL_FLAGS = -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT
LDFLAGS = -lm -lz -lpng16 -lprotobuf-c -lzvbi -lpthread -lutf8proc

ifneq (, $(findstring linux, $(SYS)))
CFLAGS +=-DGPAC_CONFIG_LINUX

TARGET = ccextractor

OBJS_DIR = objs
VPATH = ../src:../src/gpacmp4:../src/lib_ccx:../src/lib_hash

SRCS_DIR = ../src
SRCS_C = $(wildcard $(SRCS_DIR)/*.c)

SRCS_CCX = $(wildcard $(SRCS_CCX_DIR)/*.c)
OBJS_CCX = $(SRCS_CCX:$(SRCS_CCX_DIR)/%.c=$(OBJS_DIR)/%.o)

SRCS_PNG_DIR = $(SRCS_DIR)/libpng
SRCS_PNG = $(wildcard $(SRCS_PNG_DIR)/*.c)
OBJS_PNG = $(SRCS_PNG:$(SRCS_PNG_DIR)/%.c=$(OBJS_DIR)/%.o)

SRCS_ZVBI_DIR = $(SRCS_DIR)/zvbi
SRCS_ZVBI = $(wildcard $(SRCS_ZVBI_DIR)/*.c)
OBJS_ZVBI = $(SRCS_ZVBI:$(SRCS_ZVBI_DIR)/%.c=$(OBJS_DIR)/%.o)

SRCS_GPACMP4_DIR = $(SRCS_DIR)/gpacmp4
SRCS_GPACMP4_C = $(wildcard $(SRCS_GPACMP4_DIR)/*.c)
SRCS_GPACMP4_CPP = $(wildcard $(SRCS_GPACMP4_DIR)/*.cpp)
OBJS_GPACMP4 = $(SRCS_GPACMP4_C:$(SRCS_GPACMP4_DIR)/%.c=$(OBJS_DIR)/%.o) \
			   $(SRCS_GPACMP4_CPP:$(SRCS_GPACMP4_DIR)/%.cpp=$(OBJS_DIR)/%.o)

SRCS_ZLIB_DIR = $(SRCS_DIR)/zlib
SRCS_ZLIB = $(wildcard $(SRCS_ZLIB_DIR)/*.c)
OBJS_ZLIB = $(SRCS_ZLIB:$(SRCS_ZLIB_DIR)/%.c=$(OBJS_DIR)/%.o)

SRCS_HASH_DIR = $(SRCS_DIR)/lib_hash
SRCS_HASH = $(wildcard $(SRCS_HASH_DIR)/*.c)
OBJS_HASH = $(SRCS_HASH:$(SRCS_HASH_DIR)/%.c=$(OBJS_DIR)/%.o)

SRCS_UTF8_DIR = $(SRCS_DIR)/utf8proc
SRCS_UTF8 = $(SRCS_UTF8_DIR)/utf8proc.c
OBJS_UTF8 = $(SRCS_UTF8:$(SRCS_UTF8_DIR)/%.c=$(OBJS_DIR)/%.o)

INSTLALL = cp -f -p
INSTLALL_PROGRAM = $(INSTLALL)
DESTDIR = /usr/bin

Return to bug 525902

Lines 1-20 Link Here

(-)./linux/build.orig (-10 / +6 lines)
1	#!/bin/bash	1	#!/bin/bash
2	BLD_FLAGS="-g -std=gnu99 -Wno-write-strings -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DENABLE_OCR"	2	BLD_FLAGS="-std=gnu99 -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DENABLE_OCR"
3	BLD_INCLUDE="-I../src -I /usr/include/leptonica/ -I /usr/include/tesseract/ -I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi -I../src/lib_hash -I../src/protobuf-c -I../src/utf8proc"	3	BLD_INCLUDE="-I../src -I /usr/include/leptonica/ -I /usr/include/tesseract/ -I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/lib_hash"
4	SRC_LIBPNG="$(find ../src/libpng/ -name '*.c')"
5	SRC_ZLIB="$(find ../src/zlib/ -name '*.c')"
6	SRC_ZVBI="$(find ../src/zvbi/ -name '*.c')"
7	SRC_CCX="$(find ../src/lib_ccx/ -name '*.c')"	4	SRC_CCX="$(find ../src/lib_ccx/ -name '*.c')"
8	SRC_GPAC="$(find ../src/gpacmp4/ -name '*.c')"	5	SRC_GPAC="$(find ../src/gpacmp4/ -name '*.c')"
9	SRC_HASH="$(find ../src/lib_hash/ -name '*.c')"	6	SRC_HASH="$(find ../src/lib_hash/ -name '*.c')"
10	SRC_PROTOBUF="$(find ../src/protobuf-c/ -name '*.c')"	7	BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_GPAC $SRC_HASH"
11	SRC_UTF8PROC="../src/utf8proc/utf8proc.c"	8	BLD_SOURCES="../src/ccextractor.c"
12	BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_GPAC $SRC_ZLIB $SRC_ZVBI $SRC_LIBPNG $SRC_HASH $SRC_PROTOBUF $SRC_UTF8PROC"	9	BLD_LINKER="-lm -zmuldefs -l tesseract -l lept -lz -lpng16 -lprotobuf-c -lzvbi -lpthread -lutf8proc"
13	BLD_LINKER="-lm -zmuldefs -l tesseract -l lept"
14		10
15	./pre-build.sh	11	./pre-build.sh
16		12
17	out=$((LC_ALL=C gcc $BLD_FLAGS $BLD_INCLUDE -o ccextractor $BLD_SOURCES $BLD_LINKER) 2>&1)	13	out=$(gcc $BLD_FLAGS $BLD_INCLUDE -o ccextractor $BLD_SOURCES $BLD_LINKER)
18	res=$?	14	res=$?
19	if [[ $out == "gcc: command not found" ]]	15	if [[ $out == "gcc: command not found" ]]
20	then	16	then

Lines 2-12 Link Here

(-)./linux/Makefile.orig (-21 / +4 lines)
2		2
3	CC = gcc	3	CC = gcc
4	SYS := $(shell gcc -dumpmachine)	4	SYS := $(shell gcc -dumpmachine)
5	CFLAGS = -O3 -std=gnu99 -s	5	CFLAGS = -std=gnu99 -s
6	INCLUDE = -I../src/gpacmp4/ -I../src/libpng -I../src/lib_hash -I../src/protobuf-c -I../src/zlib -I../src/lib_ccx -I../src/.	6	INCLUDE = -I../src/gpacmp4/ -I../src/lib_hash -I../src/lib_ccx
7	INCLUDE += -I../src/zvbi -I../src/utf8proc
8	ALL_FLAGS = -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT	7	ALL_FLAGS = -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT
9	LDFLAGS = -lm	8	LDFLAGS = -lm -lz -lpng16 -lprotobuf-c -lzvbi -lpthread -lutf8proc
10		9
11	ifneq (, $(findstring linux, $(SYS)))	10	ifneq (, $(findstring linux, $(SYS)))
12	CFLAGS +=-DGPAC_CONFIG_LINUX	11	CFLAGS +=-DGPAC_CONFIG_LINUX
Lines 14-20 Link Here
14	TARGET = ccextractor	13	TARGET = ccextractor
15		14
16	OBJS_DIR = objs	15	OBJS_DIR = objs
17	VPATH = ../src:../src/gpacmp4:../src/libpng:../src/zlib:../src/lib_ccx:../src/zvbi:../src/lib_hash:../src/utf8proc:../src/protobuf-c	16	VPATH = ../src:../src/gpacmp4:../src/lib_ccx:../src/lib_hash
18		17
19	SRCS_DIR = ../src	18	SRCS_DIR = ../src
20	SRCS_C = $(wildcard $(SRCS_DIR)/*.c)	19	SRCS_C = $(wildcard $(SRCS_DIR)/*.c)
Lines 24-55 Link Here
24	SRCS_CCX = $(wildcard $(SRCS_CCX_DIR)/*.c)	23	SRCS_CCX = $(wildcard $(SRCS_CCX_DIR)/*.c)
25	OBJS_CCX = $(SRCS_CCX:$(SRCS_CCX_DIR)/%.c=$(OBJS_DIR)/%.o)	24	OBJS_CCX = $(SRCS_CCX:$(SRCS_CCX_DIR)/%.c=$(OBJS_DIR)/%.o)
26		25
27	SRCS_PNG_DIR = $(SRCS_DIR)/libpng
28	SRCS_PNG = $(wildcard $(SRCS_PNG_DIR)/*.c)
29	OBJS_PNG = $(SRCS_PNG:$(SRCS_PNG_DIR)/%.c=$(OBJS_DIR)/%.o)
30
31	SRCS_ZVBI_DIR = $(SRCS_DIR)/zvbi
32	SRCS_ZVBI = $(wildcard $(SRCS_ZVBI_DIR)/*.c)
33	OBJS_ZVBI = $(SRCS_ZVBI:$(SRCS_ZVBI_DIR)/%.c=$(OBJS_DIR)/%.o)
34
35	SRCS_GPACMP4_DIR = $(SRCS_DIR)/gpacmp4	26	SRCS_GPACMP4_DIR = $(SRCS_DIR)/gpacmp4
36	SRCS_GPACMP4_C = $(wildcard $(SRCS_GPACMP4_DIR)/*.c)	27	SRCS_GPACMP4_C = $(wildcard $(SRCS_GPACMP4_DIR)/*.c)
37	SRCS_GPACMP4_CPP = $(wildcard $(SRCS_GPACMP4_DIR)/*.cpp)	28	SRCS_GPACMP4_CPP = $(wildcard $(SRCS_GPACMP4_DIR)/*.cpp)
38	OBJS_GPACMP4 = $(SRCS_GPACMP4_C:$(SRCS_GPACMP4_DIR)/%.c=$(OBJS_DIR)/%.o) \	29	OBJS_GPACMP4 = $(SRCS_GPACMP4_C:$(SRCS_GPACMP4_DIR)/%.c=$(OBJS_DIR)/%.o) \
39	$(SRCS_GPACMP4_CPP:$(SRCS_GPACMP4_DIR)/%.cpp=$(OBJS_DIR)/%.o)	30	$(SRCS_GPACMP4_CPP:$(SRCS_GPACMP4_DIR)/%.cpp=$(OBJS_DIR)/%.o)
40		31
41	SRCS_ZLIB_DIR = $(SRCS_DIR)/zlib
42	SRCS_ZLIB = $(wildcard $(SRCS_ZLIB_DIR)/*.c)
43	OBJS_ZLIB = $(SRCS_ZLIB:$(SRCS_ZLIB_DIR)/%.c=$(OBJS_DIR)/%.o)
44
45	SRCS_HASH_DIR = $(SRCS_DIR)/lib_hash	32	SRCS_HASH_DIR = $(SRCS_DIR)/lib_hash
46	SRCS_HASH = $(wildcard $(SRCS_HASH_DIR)/*.c)	33	SRCS_HASH = $(wildcard $(SRCS_HASH_DIR)/*.c)
47	OBJS_HASH = $(SRCS_HASH:$(SRCS_HASH_DIR)/%.c=$(OBJS_DIR)/%.o)	34	OBJS_HASH = $(SRCS_HASH:$(SRCS_HASH_DIR)/%.c=$(OBJS_DIR)/%.o)
48		35
49	SRCS_UTF8_DIR = $(SRCS_DIR)/utf8proc
50	SRCS_UTF8 = $(SRCS_UTF8_DIR)/utf8proc.c
51	OBJS_UTF8 = $(SRCS_UTF8:$(SRCS_UTF8_DIR)/%.c=$(OBJS_DIR)/%.o)
52
53	INSTLALL = cp -f -p	36	INSTLALL = cp -f -p
54	INSTLALL_PROGRAM = $(INSTLALL)	37	INSTLALL_PROGRAM = $(INSTLALL)
55	DESTDIR = /usr/bin	38	DESTDIR = /usr/bin